| commit | c4f196b661cb9d38f74fa7a1a5a4abb921980387 | [log] [tgz] |
|---|---|---|
| author | Christine Hallstrom <hallstrom@google.com> | Fri Sep 18 22:06:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 22:06:38 2015 +0000 |
| tree | 3cd2d3fa1a937b84fece2b05aac88af09a110913 | |
| parent | 4092eeb7f7b079a87c4583c713c0e6d2e208b3c4 [diff] | |
| parent | 039fd00fd2b499a871be8551d80d299120ff5595 [diff] |
am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev * commit '039fd00fd2b499a871be8551d80d299120ff5595': Manual 'cherry pick' to fix CTS tests for MediaControllerTest.