| commit | 31d6897ac51aede4fcab18bd7b3ed7c04d895a5c | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed May 30 11:30:25 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 30 11:30:25 2018 -0700 |
| tree | 20b7229c93f07a50db57a3cf5a0c686e275384b2 | |
| parent | f74c983280e51250f332206bde6dd986f3ea8fee [diff] | |
| parent | ef157649d59c25e43ed3bd07c8975148bbe0048a [diff] |
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev am: e3348a2593 am: ef157649d5 Change-Id: I38a9da260726d0a07366047662be57a6e4bf8fd0