tree 75c1764562c54d7f46d2255c1e82e05496f20e09
parent 88e94d3c1e3644d1c36b9e9c2f161cfe891ce4e1
parent 8631fd7b270e99ebee6ba056f4edd38e6bd4f93f
author Hassan Shojania <shojania@google.com> 1496688809 +0000
committer android-build-merger <android-build-merger@google.com> 1496688809 +0000

Merge "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing" into oc-dev
am: 8631fd7b27

Change-Id: I88c8b84a400df2ed20e4e2017309634d8a725af4