| commit | 5dabb58d8ebd89512d0ad357bc67a73ef8545685 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Fri Feb 14 20:37:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:37:10 2014 +0000 |
| tree | c215659d5c27956224d6fd3791c2cf3454a42d0b | |
| parent | 194f2e468d3bda0780c990e43c83d1ef6dd2f47d [diff] | |
| parent | 1a3708ec0fa2c05b1858ef0a87fae2e851307661 [diff] |
am 1a3708ec: am 9ba343d7: (-s ours) am a78b25f8: (-s ours) DO NOT MERGE * commit '1a3708ec0fa2c05b1858ef0a87fae2e851307661':