| commit | 275fa57daac56bbc6eef0e69f77571eb956819f6 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Thu Aug 27 04:39:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 04:39:00 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | 18f564076b76720bbc82ffefd34123d07d26a2df [diff] | |
| parent | eb2f51d1ca7d84d55cecfbfbc41d5b1d9c62a69d [diff] |
am eb2f51d1: (-s ours) am 75cabb40: am 470d1704: am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf * commit 'eb2f51d1ca7d84d55cecfbfbc41d5b1d9c62a69d':