OSDN Git Service

am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakel...
authorSridhar Vashist <svashist@motorola.com>
Mon, 14 Sep 2015 22:17:14 +0000 (22:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Sep 2015 22:17:14 +0000 (22:17 +0000)
* commit '92a420eb184015f9bae2d189ef335f86af9cbcbb':
  DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.


Trivial merge