| commit | 68e1d359bd55785354656339db30dfd2d75ab7ce | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 19:05:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:05:53 2015 +0000 |
| tree | 162aa76ce1ac88a2a386b0b826c5b850a869c82e | |
| parent | 2a1514dc1ec502125df6af7e30425403ff5a21a4 [diff] | |
| parent | 3bbdccc7743a3a7343ad3cc68d37508cab185d0d [diff] |
am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 * commit '3bbdccc7743a3a7343ad3cc68d37508cab185d0d':