]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a9e99fa 1f1faeb)
am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop
authorRamanan Rajeswaran <ramanan@google.com>
Mon, 13 Feb 2012 22:27:40 +0000 (14:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Feb 2012 22:27:40 +0000 (14:27 -0800)
* commit '352b8d03c63585f4eaec09d2e39a4d173be83164':
  DO NOT MERGE


Trivial merge
mirror of aapt