]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c54cad7 2dc8436)
am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside...
authorXavier Ducrohet <xav@android.com>
Fri, 24 Feb 2012 02:47:08 +0000 (18:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 02:47:08 +0000 (18:47 -0800)
* commit '54c8c3d920ee863716638483602a011943da6484':
  Move the automatic namespace outside of the res namespace. do not merge.


Trivial merge
mirror of aapt