]> git.saurik.com Git - android/aapt.git/commit
am 4ec961d5: (-s ours) DO NOT MERGE
authorRamanan Rajeswaran <ramanan@google.com>
Wed, 7 Mar 2012 23:39:40 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Mar 2012 23:39:40 +0000 (15:39 -0800)
commit2ac58f0f8da20ec4af16b08e616c07d8caa93cf2
treec9d9ea1023744666d1faa92de66358cd18986f28
parent0a9550cf47a3f0d31d186c34cfda05ff709b6b41
parentd4e31cfa5a37e121e76254d064f43f153a92ff69
am 4ec961d5: (-s ours) DO NOT MERGE

* commit '4ec961d5752363161cc78112fbe542b1c0473158':
  DO NOT MERGE