commit | d5749a8eb926eed1045c7b8ef3ae4c2e9b2cab98 | [log] [tgz] |
---|---|---|
author | Sridhar Vashist <svashist@motorola.com> | Mon Sep 14 22:23:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 22:23:57 2015 +0000 |
tree | 33e8799072fbe79abdbce4caa1bf86a7d2a07de1 | |
parent | 9044e8cd7847a2d2b172f434acc202a25e50b5c1 [diff] | |
parent | c350430490cce6b54a5c38f91e8a12d245332c18 [diff] |
am c3504304: am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. * commit 'c350430490cce6b54a5c38f91e8a12d245332c18': DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.