tree 3faf9e1a93eaaa93e368af034deafc0106858315
parent 82a188f0dfb826d6d71538319adf991792ea037e
parent e3348a25935099838a917cf4556c4dccc714e0ef
author Robert Shih <robertshih@google.com> 1527704025 -0700
committer android-build-merger <android-build-merger@google.com> 1527704025 -0700

Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c