| commit | 848e00886d4bd169bfe2f030315604ca496b2ab9 | [log] [tgz] |
|---|---|---|
| author | Christine Hallstrom <hallstrom@google.com> | Sat Sep 19 15:34:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 19 15:34:31 2015 +0000 |
| tree | 7ce62051eaf58008766ee746ee5181ac3bf8d9e3 | |
| parent | 2b19b6046cd7273ddd2818a2fbb8d3f0eaaa623a [diff] | |
| parent | c4f196b661cb9d38f74fa7a1a5a4abb921980387 [diff] |
am c4f196b6: am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev * commit 'c4f196b661cb9d38f74fa7a1a5a4abb921980387': Manual 'cherry pick' to fix CTS tests for MediaControllerTest.