| commit | 10e6377c64667dd23f97c8d6aee9fbb544786060 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 01:17:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 01:17:12 2015 +0000 |
| tree | 3024caa88cedc9f9eff427cd57ae2fe747721a0d | |
| parent | affc5b6a52e612ec9ea436733865027e37fc1861 [diff] | |
| parent | 24d417770b9b241ad97930ee0ececd301e62fd89 [diff] |
am 24d41777: 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 '24d417770b9b241ad97930ee0ececd301e62fd89':