Merge "app crash due to Invalid column count IllegalArgumentException" am: 30b3ba89e4 am: 1a3969c61e am: 9a077af94c

Change-Id: I0f744ad162ba27dd951d54df85ae4f5d8dd26273
tree: ef10ddf8c5ce59d362647df644568f9bd454e8d3
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE
  8. OWNERS