| commit | 7e51c977f5b44413bf41d61a78506009e3a1585e | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Mon Sep 21 22:15:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:15:47 2015 +0000 |
| tree | 6d130a6508234fa9bb680f796dbe77c113703c05 | |
| parent | 57660eb7fe3a37c39c8c1352b56af653d4a51a3f [diff] | |
| parent | f7556dfc7af3e6b9cff64aba0d23e4205d576f2c [diff] |
am f7556dfc: am 431e350e: am 7036d2e6: am a6429cf4: am 285f632c: 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 'f7556dfc7af3e6b9cff64aba0d23e4205d576f2c':