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

* commit '906befb10305b4102e457c5e72ce76067f1d0438':
  Fix potential NPE in saveHorizontalOffsets
tree: 54d7f1ef8e6919f222f8f350312a1f9aee0d5fe7
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags