commit | a914061855880abdbab712a4cba84b2a2929d9b3 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Thu Feb 23 18:49:51 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 18:49:51 2012 -0800 |
tree | 017d9ec7a4202769f80c494affbbeeffc505a8d7 | |
parent | 56498ad7cf8e0d972fba898c1433a8195f070eff [diff] | |
parent | 7a5798987a6cdaf7cd3be885fc6ca15651f91cd4 [diff] |
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. * commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':