tree 54d7f1ef8e6919f222f8f350312a1f9aee0d5fe7
parent 38c007e85675c0d2a6f6d6b4ec6a403ddb28e808
parent 906befb10305b4102e457c5e72ce76067f1d0438
author Jay Shrauner <shrauner@google.com> 1393885296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393885296 +0000

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

* commit '906befb10305b4102e457c5e72ce76067f1d0438':
  Fix potential NPE in saveHorizontalOffsets