tree 69c0f385575f4ada85d959900da5d3ad2d53bc6f
parent 0d42440ecb1c664862eaa7848cc45fb7ff0fb514
parent 4854e292e0cd0eb58bce4488dc849273904d9302
author Tao Bao <tbao@google.com> 1439310238 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439310238 +0000

am 4854e292: am ad509fd4: Merge "Fix potential crash"

* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash