tree d1b7eae3d9c50f072f38de808396730d50894828
parent 7e88dc6836ad2eee3500cf33b4a7147e107a54ac
parent daca30ef426e30f921a6a2d39e07a31d789b837e
author Robert Shih <robertshih@google.com> 1548714179 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548714179 +0000

Merge "mediaplayer2: allow prepare DRM in non-prepare states"