tree 7e7b4daada44770198412fa02e3e2e22a3588144
parent 56f5df728c6dd7108af774a10e57f3e2e2175d6f
parent 452a4f585d3cb707da0adf1fd91ba2c9c169b925
author Michael Jurka <mikejurka@google.com> 1339532119 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339532119 -0700

am 452a4f58: am a35a7807: Merge "Fix NPE" into jb-dev

* commit '452a4f585d3cb707da0adf1fd91ba2c9c169b925':
  Fix NPE