]> git.saurik.com Git - android/aapt.git/commit
am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
authorRamanan Rajeswaran <ramanan@google.com>
Tue, 14 Feb 2012 15:36:53 +0000 (07:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Feb 2012 15:36:53 +0000 (07:36 -0800)
commitccbec072ff642e5beeea34c2f70d5982bf9760e1
treebdce200798602d508c862c73162da00df706f6af
parentdd1acdc6f0c3523886ecaf7a881676257da9cf69
parentf036e32e8db01e6a91ed699cbeaa0294803ac7a2
am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp

* commit '128dfa514818399ff8b5fde56fa487374f6fd504':
  DO NOT MERGE