| commit | 14b4836a428a8896dab873fb8ce49960a1afc9f5 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Wed Dec 02 22:54:29 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 02 22:54:29 2015 +0000 |
| tree | 8df7bf1b2c1372977e76ff040de543742edc5160 | |
| parent | a6f0aa5785335654b5b81023655d0eeefa54dfc6 [diff] | |
| parent | a6ed5dcd044fdeec84b42472cb393ddf9315a0ae [diff] |
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6 am: 087d30c142 am: a6ed5dcd04 -s ours * commit 'a6ed5dcd044fdeec84b42472cb393ddf9315a0ae': DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."