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

* commit '1289ab125ff7c7d62d4b356343c0a032c3ffaade':
  Fix build breakage due to missing method definition
tree: 348053c9420e6963fc8fac98e580818674d17a0c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags