tree 377b7d0815b227f7779e4bd085e72b58704d6818
parent 34de1db18c5aac578f9cdd7c31465a86b960044e
parent b8b93c1b79ab7233e054425bd917a014159e7f7d
author Tao Bao <tbao@google.com> 1433279401 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433279401 +0000

am b8b93c1b: am da3f63ff: Merge "Fix the NPE when checking mRebootReason" into mnc-dev

* commit 'b8b93c1b79ab7233e054425bd917a014159e7f7d':
  Fix the NPE when checking mRebootReason