aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Sugarbroad <jpsugar@google.com>2018-09-10 21:49:21 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-09-10 21:49:21 (GMT)
commit6b46dac5a9f4d808fcd550129cb06b64b382d610 (patch)
tree776ccc34701d74cefb0bfd8182a5944b954c42d5
parent69d914c57b47c3d058aa22e49921f3d3b1faf26b (diff)
parent41a932d50503a1f0e6e907e50a6b9ce14f640835 (diff)
downloadandroid_build-6b46dac5a9f4d808fcd550129cb06b64b382d610.zip
android_build-6b46dac5a9f4d808fcd550129cb06b64b382d610.tar.gz
android_build-6b46dac5a9f4d808fcd550129cb06b64b382d610.tar.bz2
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-dr1-dev
* changes: [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