]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67b3abe 98af7ea)
am 5e7bb1e6: (-s ours) DO NOT MERGE
authorRamanan Rajeswaran <ramanan@google.com>
Wed, 7 Mar 2012 23:34:11 +0000 (15:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Mar 2012 23:34:11 +0000 (15:34 -0800)
* commit '5e7bb1e675df2cc1edd9808afcaaeed07830bd9f':
  DO NOT MERGE


Trivial merge
mirror of aapt