tree e7aabd226117b79245c91a01167c37b6fd30642e
parent 712bcb6657afa31d2c5d2c615071ac8a0e5fc778
parent 27f6dfc43c3309a6ff35041a916dc684fb0353d5
author Dongwon Kang <dwkang@google.com> 1497653252 +0000
committer android-build-merger <android-build-merger@google.com> 1497653252 +0000

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

Change-Id: I17b728eefa6ba03b10bd4c980cdbec5e8de9e5ed