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