am 38c3cef4: am f1f0df71: Merge "Don\'t wipe subclass helper\'s tables in our upgrade steps" into klp-dev

* commit '38c3cef43724e8a679f332bc0ab07c1686ea82c1':
  Don't wipe subclass helper's tables in our upgrade steps
tree: c28e419764c1930068dd7489409bd009bd350f75
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags