tree cc9e6a80dc34c5fc588aebc22c981a56451c27a0
parent 95fb5344d4da347020e09c0bfd2d8ae64362a232
parent 27f6dfc43c3309a6ff35041a916dc684fb0353d5
author Dongwon Kang <dwkang@google.com> 1497653257 +0000
committer android-build-merger <android-build-merger@google.com> 1497653257 +0000

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

Change-Id: Icb791eb1d7bcf9bdb3e0e4614c918a3e1c372a15