| commit | cc3063d6b38134d592e421a71a95618dfd4c2f7c | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 02:13:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 02:13:08 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | 657f7c1ea28963b0a856d1c211d44c745690eaf9 [diff] | |
| parent | 64b545f5946257872e1ea3800547a999111e699c [diff] |
am ed454e8f: am 7da1a934: am 08754586: am 64b545f5: 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 'ed454e8f23ef6a3897a3c7abd8cc55b11efc37f1':