tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent dffdd5eb6d366b2f35ec87f20f91207e3b4657c3
parent a9a50fef97d388ef5fb06a5953caaa79ab16496d
author Tao Bao <tbao@google.com> 1440646728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646728 +0000

am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"

* commit 'a9a50fef97d388ef5fb06a5953caaa79ab16496d':