| commit | 4080c9648806528e129a28abfea5b5b545409152 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Dec 05 22:31:50 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:31:50 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | b7d77f3ccda0535bb113d2a018a7fb1740db0800 [diff] | |
| parent | 218d56ebb43b3487ce1df57f971d82d8180dabbb [diff] |
am 218d56eb: (-s ours) Merge "Cherry pick [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations" into klp-dev * commit '218d56ebb43b3487ce1df57f971d82d8180dabbb': Cherry pick [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations