commit | 7434d2860075841b5640b0a37fd421f7de9f833c | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Thu Feb 23 18:47:08 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 18:47:08 2012 -0800 |
tree | 017d9ec7a4202769f80c494affbbeeffc505a8d7 | |
parent | 5c8dd44fbc0ff67a37b424a9729ecd34fda73844 [diff] | |
parent | 85492ed98ea89eafb77e5fc5576b052fa2e9c024 [diff] |
am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. * commit '54c8c3d920ee863716638483602a011943da6484': Move the automatic namespace outside of the res namespace. do not merge.