tree b157e243e2c89f0899a862c99595ebeea9e54e5c
parent fe50cfd53309af4dd49e572bd4a3120ea1494029
parent 0ce259c2f69cefd09342a95fbbd4c1a63a0af484
author Andreas Gampe <agampe@google.com> 1412206705 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412206705 +0000

am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"

* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
  Frameworks/base: Fix AAPT warnings