commit | 55eece280d28a87034eaf2d6b4b9d15cbf9f82e9 | [log] [tgz] |
---|---|---|
author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 21:06:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:28 2015 +0000 |
tree | 3024caa88cedc9f9eff427cd57ae2fe747721a0d | |
parent | 5a1c9904b0dd18fa801e68da5f91dd3247056407 [diff] | |
parent | 68e1d359bd55785354656339db30dfd2d75ab7ce [diff] |
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 '68e1d359bd55785354656339db30dfd2d75ab7ce':