| commit | 039fd00fd2b499a871be8551d80d299120ff5595 | [log] [tgz] |
|---|---|---|
| author | Christine Hallstrom <hallstrom@google.com> | Fri Sep 18 21:49:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 21:49:42 2015 +0000 |
| tree | 3a182e891edbde074fa1fe9056ca30f8a3b081b4 | |
| parent | 069594f96a3c70b01119f689f2195e0d933c0700 [diff] | |
| parent | 13c23df90cc49aabb21e92163bac49d1fb5fa016 [diff] |
am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev * commit '13c23df90cc49aabb21e92163bac49d1fb5fa016': Manual 'cherry pick' to fix CTS tests for MediaControllerTest.