tree 90a769b9cac8715873e9b1364335e12c8abd2e50
parent 548bb3d3521eee5b9f34b2860c698cb0c5226e27
parent 152d9aae631381ea28f5701168d372a1486a7502
author Andreas Gampe <agampe@google.com> 1412233633 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412233633 +0000

am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"

* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues