From: Ramanan Rajeswaran <ramanan@google.com>
Date: Tue, 14 Feb 2012 15:36:53 +0000 (-0800)
Subject: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/ccbec072ff642e5beeea34c2f70d5982bf9760e1?hp=-c

am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp

* commit '128dfa514818399ff8b5fde56fa487374f6fd504':
  DO NOT MERGE
---

ccbec072ff642e5beeea34c2f70d5982bf9760e1