tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 46e965c77e31e3e67d9b93ca1ed0257614e45e9c
parent b13fe892d82a2ccde3e338c426b6cf70aea1e564
author Tao Bao <tbao@google.com> 1440684837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684837 +0000

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

* commit 'b13fe892d82a2ccde3e338c426b6cf70aea1e564':