commit | b13fe892d82a2ccde3e338c426b6cf70aea1e564 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:48 2015 +0000 |
tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
parent | dffdd5eb6d366b2f35ec87f20f91207e3b4657c3 [diff] | |
parent | a9a50fef97d388ef5fb06a5953caaa79ab16496d [diff] |
am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash" * commit 'a9a50fef97d388ef5fb06a5953caaa79ab16496d':