am 8340c92d: am bb650e8f: am 906befb1: Merge "Fix potential NPE in saveHorizontalOffsets" into klp-dev

* commit '8340c92d31e52222cd9a5bdb806b5b3f72064581':
  Fix potential NPE in saveHorizontalOffsets
tree: 01d47643d33bcaac472b21b9cfc961bfae0e39d5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags