tree 51bd4711d27c207b1c1f290dfa1e750f2766ff2f
parent 86c5a9995f130c069eded44c155b232a47fd2341
parent 31418a1e9b905593587d8bf7a4705429db549d97
author Jean-Baptiste Queru <jbq@google.com> 1303847152 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303847152 -0700

am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '31418a1e9b905593587d8bf7a4705429db549d97':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.