| commit | 1c52044b2b6ad0f5b6e6fec8c002e5f2df5d8903 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Oct 28 00:43:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 00:43:29 2014 +0000 |
| tree | bcb6624239ac9a1044af355e569ac9a9d812e36b | |
| parent | 51432480c46999c8a2617f0f082b32051d48b0f0 [diff] | |
| parent | b10029773f6cd4ce4846ff8490485ce963331f6a [diff] |
am b1002977: (-s ours) Merge commit \'081185e3\' into lmp-dev-plus-aosp * commit 'b10029773f6cd4ce4846ff8490485ce963331f6a':