| commit | a0aff954b4ec831ee5d54319b0c1b71e479b5213 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 08 16:12:24 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 08 16:12:24 2015 +0000 |
| tree | 8587c14192a268c9b55f064c0e0c2a08b836307b | |
| parent | daa7e366c600cf28cfbf30515d99f591336606c8 [diff] | |
| parent | 3efe7fc6ff5e7461e7b265dd5f4424ba9e0c7b58 [diff] |
Merge "Rename base/ to android-base/." am: 5986d9f263 am: a77731e14d am: fbdec4f643 * commit 'fbdec4f6434e7040f410b99fb9a8e7d1f809e151': Rename base/ to android-base/.
diff --git a/base/include/android-base b/base/include/android-base deleted file mode 120000 index 8681f8b..0000000 --- a/base/include/android-base +++ /dev/null
@@ -1 +0,0 @@ -base \ No newline at end of file
diff --git a/base/include/base/file.h b/base/include/android-base/file.h similarity index 100% rename from base/include/base/file.h rename to base/include/android-base/file.h
diff --git a/base/include/base/logging.h b/base/include/android-base/logging.h similarity index 100% rename from base/include/base/logging.h rename to base/include/android-base/logging.h
diff --git a/base/include/base/macros.h b/base/include/android-base/macros.h similarity index 100% rename from base/include/base/macros.h rename to base/include/android-base/macros.h
diff --git a/base/include/base/memory.h b/base/include/android-base/memory.h similarity index 100% rename from base/include/base/memory.h rename to base/include/android-base/memory.h
diff --git a/base/include/base/parseint.h b/base/include/android-base/parseint.h similarity index 100% rename from base/include/base/parseint.h rename to base/include/android-base/parseint.h
diff --git a/base/include/base/stringprintf.h b/base/include/android-base/stringprintf.h similarity index 100% rename from base/include/base/stringprintf.h rename to base/include/android-base/stringprintf.h
diff --git a/base/include/base/strings.h b/base/include/android-base/strings.h similarity index 100% rename from base/include/base/strings.h rename to base/include/android-base/strings.h
diff --git a/base/include/base/test_utils.h b/base/include/android-base/test_utils.h similarity index 100% rename from base/include/base/test_utils.h rename to base/include/android-base/test_utils.h
diff --git a/base/include/base/unique_fd.h b/base/include/android-base/unique_fd.h similarity index 100% rename from base/include/base/unique_fd.h rename to base/include/android-base/unique_fd.h
diff --git a/base/include/base/utf8.h b/base/include/android-base/utf8.h similarity index 100% rename from base/include/base/utf8.h rename to base/include/android-base/utf8.h