]> git.saurik.com Git - android/aapt.git/commitdiff
am 8046e294: Merge "DO NOT MERGE" into ics-scoop
authorRamanan Rajeswaran <ramanan@google.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE


Trivial merge