| commit | ab7c75c498a816a13f56f0d92684c16c693156f3 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Thu Sep 01 14:16:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 01 14:16:42 2016 +0000 |
| tree | 61228b2ff6c6ca6fd8d25000a2f53362ba73db0c | |
| parent | de34b121178fa74e7690861bc0abeb9f7c70d66a [diff] | |
| parent | 288c91b79594c73846f25c89b6c2e52351f28b21 [diff] |
Merge "Fix AMediaExtractor_getSampleCryptoInfo returning iv as key." into nyc-mr1-dev am: 57d8e70186 am: 288c91b795 Change-Id: I05882f31bb24a8f7991f78b8f42aab8b68679434