| commit | 285f632cba3fb58e7c0c2e5028b0607ab4aaf2d6 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 21:30:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:43 2015 +0000 |
| tree | 48221ce2737261b73bb445df385c42dd21e5df0b | |
| parent | f7142c13ebfeb0c5041687a3e4300efb6722e821 [diff] | |
| parent | 55eece280d28a87034eaf2d6b4b9d15cbf9f82e9 [diff] |
am 55eece28: am 68e1d359: 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 '55eece280d28a87034eaf2d6b4b9d15cbf9f82e9':