| commit | 7bc2c81736e916630397e4b27f8e8d37cb3ec389 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 00:50:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 00:50:55 2015 +0000 |
| tree | 3a2dc36bc6652f9592fa077aba710bfc41767511 | |
| parent | 91a9bc2ac2e907be881a4cfabcdef7ed2d8a9445 [diff] | |
| parent | f742ea6d30fde381f6b93776fe247b232edebd74 [diff] |
am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev * commit 'f742ea6d30fde381f6b93776fe247b232edebd74':