OSDN Git Service

Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
authorRobert Shih <robertshih@google.com>
Wed, 30 May 2018 18:13:45 +0000 (11:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 18:13:45 +0000 (11:13 -0700)
commitef157649d59c25e43ed3bd07c8975148bbe0048a
tree3faf9e1a93eaaa93e368af034deafc0106858315
parent82a188f0dfb826d6d71538319adf991792ea037e
parente3348a25935099838a917cf4556c4dccc714e0ef
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c