| commit | 64b545f5946257872e1ea3800547a999111e699c | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 01:27:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 01:27:24 2015 +0000 |
| tree | 48221ce2737261b73bb445df385c42dd21e5df0b | |
| parent | 6de0e351c404d79799544f3168ef4a707bf10b4d [diff] | |
| parent | 10e6377c64667dd23f97c8d6aee9fbb544786060 [diff] |
am 10e6377c: 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 '10e6377c64667dd23f97c8d6aee9fbb544786060':