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

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