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

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