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)
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c


Trivial merge