commit | 92bc57a4a6dbb68b2359184c9d5f672276d6aa5d | [log] [tgz] |
---|---|---|
author | Lajos Molnar <lajos@google.com> | Tue May 24 14:42:53 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 24 14:42:53 2016 +0000 |
tree | 8f82805ee70dd69bd3d774b984811bb3b77db38c | |
parent | e1efbed1678e08764c90bb4e85e5f6a20bd741b5 [diff] | |
parent | a7a5c34c54ea618425645f5c067ac56a36038268 [diff] |
Merge "stagefright: define mpeg2 HighP level constant am: 9e332babb9 am: 6c25a7752d" into nyc-mr1-dev-plus-aosp am: a7a5c34c54 * commit 'a7a5c34c54ea618425645f5c067ac56a36038268': Change-Id: I082ef0cbaa0bb90f42a964360dcfd5bcfa26d923