| commit | 24d417770b9b241ad97930ee0ececd301e62fd89 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 01:06:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 01:06:47 2015 +0000 |
| tree | 162aa76ce1ac88a2a386b0b826c5b850a869c82e | |
| parent | db636cae9539b9ddc83f066e1c2bd4c61a98deff [diff] | |
| parent | 7bc2c81736e916630397e4b27f8e8d37cb3ec389 [diff] |
am 7bc2c817: 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 '7bc2c81736e916630397e4b27f8e8d37cb3ec389':