am 22c6d081: am 1289ab12: Merge "Fix build breakage due to missing method definition" into klp-dev

* commit '22c6d081c7205402d1cc5d8843cc2442d93355e1':
  Fix build breakage due to missing method definition
tree: 09c35cdfd02c0c7b360ded9df2e21b5719620bbe
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags