tree 25fa090e2cbe94a2ffcfb9076815162f0fa29f42
parent a488402046bffd51803cc98815824a27f510d1c5
parent cf43836c9a6f10d42f163a5fb1ed039d98f51dd6
author Edwin Wong <edwinwong@google.com> 1504810727 +0000
committer android-build-merger <android-build-merger@google.com> 1504810727 +0000

Merge "Fix AMediaDrm_queryKeyStatus returns key:key instead key:value pair." into oc-mr1-dev am: 872011203e
am: cf43836c9a

Change-Id: I6241d5d1231046988b155837f5454bdd60e70277