commit | a77731e14de614e26ddbf21daadba217c647be68 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue Dec 08 16:06:06 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Dec 08 16:06:06 2015 +0000 |
tree | ef0c0c9d63b0d634c94c7d282011946455694ff9 | |
parent | f6df8fce6d0bea7da34e2e16edc691881b92105a [diff] | |
parent | 5986d9f263d08ef8876656098cbe95b59d310f21 [diff] |
Merge "Rename base/ to android-base/." am: 5986d9f263 * commit '5986d9f263d08ef8876656098cbe95b59d310f21': 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