]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8d306e b6b0216)
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)
* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':


Trivial merge
mirror of aapt