| commit | b640b49e4451dacb5ce181df86b7c662ee50e693 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 16 15:56:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 15:56:34 2015 +0000 |
| tree | b0d6ca40bde4f2dbf8a69bd982bf053825434ab4 | |
| parent | b4a9fcb132727d49fdfd96c31f71f731ceea7faa [diff] | |
| parent | 9feaaaf44682c72dc5c771c93ef01ec793b6a7e3 [diff] |
am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 * commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':