]> git.saurik.com Git - android/aapt.git/commit
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside...
authorXavier Ducrohet <xav@android.com>
Fri, 24 Feb 2012 02:49:51 +0000 (18:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 02:49:51 +0000 (18:49 -0800)
commita632ef41ebadaf1d531a1237516d3673aac7d557
treec9d9ea1023744666d1faa92de66358cd18986f28
parentf8d306eb166043cc2cfb9c444e4a2dda200636f6
parentb6b0216e00d2e290637e72645d84716a63f15075
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':