tree dba08a8301476a0be1c971b9975f019216a74fcf
parent 1d32e9f8e5ba52d69c6319270c8a63a995d2c4f2
parent 838be3907fc58eab119d7093a3d73be7267bd4d2
author TreeHugger Robot <treehugger-gerrit@google.com> 1496688288 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496688290 +0000

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