aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Sugarbroad <jpsugar@google.com>2018-09-10 21:49:20 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-10 21:49:20 (GMT)
commit2ba5f007a997c77944d8beb6d236314412a668c4 (patch)
tree4dadf614967864d400cbb9294246df4771859152
parent428866c804f80325af267fd29633d8ab43beff8d (diff)
parent0c824a631e8a9268f5ab248c33098118df5f3d67 (diff)
downloadandroid_build-2ba5f007a997c77944d8beb6d236314412a668c4.zip
android_build-2ba5f007a997c77944d8beb6d236314412a668c4.tar.gz
android_build-2ba5f007a997c77944d8beb6d236314412a668c4.tar.bz2
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr2-dev
* changes: [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 [RESTRICT AUTOMERGE] Remove build/libs
-rw-r--r--tools/libhost/Android.mk (renamed from libs/host/Android.mk)0
-rw-r--r--tools/libhost/CopyFile.c (renamed from libs/host/CopyFile.c)0
-rw-r--r--tools/libhost/include/host/CopyFile.h (renamed from libs/host/include/host/CopyFile.h)0
3 files changed, 0 insertions, 0 deletions
diff --git a/libs/host/Android.mk b/tools/libhost/Android.mk
index bc25e4b..bc25e4b 100644
--- a/libs/host/Android.mk
+++ b/tools/libhost/Android.mk
diff --git a/libs/host/CopyFile.c b/tools/libhost/CopyFile.c
index 5be012c..5be012c 100644
--- a/libs/host/CopyFile.c
+++ b/tools/libhost/CopyFile.c
diff --git a/libs/host/include/host/CopyFile.h b/tools/libhost/include/host/CopyFile.h
index e65712b..e65712b 100644
--- a/libs/host/include/host/CopyFile.h
+++ b/tools/libhost/include/host/CopyFile.h