tree 0c04666a4c7eae8acc37db5abec5aea649def645
parent 7c1ae0e73fe788bb285ba6b874d25f8a1d4537c8
parent e09e96617a341f52b900b39c4270784998a4b672
author Dongwon Kang <dwkang@google.com> 1496986617 +0000
committer android-build-merger <android-build-merger@google.com> 1496986617 +0000

Merge "Throw IAE when crypto or descrambler is not given for secure codec" into oc-dev
am: e09e96617a

Change-Id: If49a9bb93be590fad894896c36272355236ecd55