]> git.saurik.com Git - android/aapt.git/commit
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)
commit487d09b4f9f973323fe6b6bdab8632f69b569890
treebdce200798602d508c862c73162da00df706f6af
parenta9e99fa39c6953e3c3d2c311dd0d5fbea4d39b7c
parent1f1faebb712096725b4412fc51c31bd82f6bc049
am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop

* commit '352b8d03c63585f4eaec09d2e39a4d173be83164':
  DO NOT MERGE