| commit | 767b29238992f0f3e8cb4173cb7b3f1a8a04638f | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Tue Dec 10 01:49:24 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:49:24 2013 +0000 |
| tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
| parent | 66643addd6189816bdc13420e651b7b6c251ec04 [diff] | |
| parent | fc1f6f7c2f49bd08c1b0ef5c5c96d83df4cee04f [diff] |
am fc1f6f7c: (-s ours) am 218d56eb: Merge "Cherry pick [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations" into klp-dev * commit 'fc1f6f7c2f49bd08c1b0ef5c5c96d83df4cee04f':