diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-02-23 18:42:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 18:42:01 -0800 |
| commit | b3c780f16c37d2fb41a4eb211ea062b4c0b4e366 (patch) | |
| tree | d709655aa10af3b3e80d449c5381dfd167120537 /tools/aapt | |
| parent | 9694910e17a18c307e61811284f88a26db2bfbae (diff) | |
| parent | 816b873df1ab98d0e79913cf589b7b1fbaf14e85 (diff) | |
| download | frameworks_base-b3c780f16c37d2fb41a4eb211ea062b4c0b4e366.zip frameworks_base-b3c780f16c37d2fb41a4eb211ea062b4c0b4e366.tar.gz frameworks_base-b3c780f16c37d2fb41a4eb211ea062b4c0b4e366.tar.bz2 | |
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index 9ee6c84..8d7acee 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -21,7 +21,7 @@ const char* const RESOURCES_ROOT_NAMESPACE = "http://schemas.android.com/apk/res/"; const char* const RESOURCES_ANDROID_NAMESPACE = "http://schemas.android.com/apk/res/android"; -const char* const RESOURCES_AUTO_PACKAGE_NAMESPACE = "http://schemas.android.com/apk/res/auto"; +const char* const RESOURCES_AUTO_PACKAGE_NAMESPACE = "http://schemas.android.com/apk/res-auto"; const char* const RESOURCES_ROOT_PRV_NAMESPACE = "http://schemas.android.com/apk/prv/res/"; const char* const XLIFF_XMLNS = "urn:oasis:names:tc:xliff:document:1.2"; |