tree 22381050e86e3b5fa8906d47ae81c8d8d82c2a85
parent 62b2af35d0561759e2e352f99600b735a42a2a4c
parent e451414d75c8baec6aed0326a82632f2886c32e6
author Alice Yang <alice@google.com> 1363655166 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363655166 +0000

am e451414d: Merge "Fix NPE" into jb-ub-mail-ur9

* commit 'e451414d75c8baec6aed0326a82632f2886c32e6':
  Fix NPE