Merge "Clean up extra helper methods."
tree: 72a324cba626b68489abb45cb0caddc81edb747f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags