tree cd5f291b0686ddf276b4f2a6fbaccca7e1e68ee2
parent 03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2
parent 5ac10036fd45cd2a6da32abd02e942617edec50d
author Alice Yang <alice@google.com> 1378279618 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378279618 +0000

Merge "Revert "Revert "Prevent an NPE""" into jb-ub-mail-ur10