Merge "Fix errors caught by aapt2"
am: 997d8d2115

Change-Id: Ic077fa564720c10dd9d55c5465d43f9f120fa229
tree: 1a22cb763cfdfd3f179cfeef41b2433d81b884f0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS