commit | a7a5c34c54ea618425645f5c067ac56a36038268 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 24 14:28:36 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 14:28:36 2016 +0000 |
tree | 4599f372b15a6caa37f234f1a1cedcf415e9559c | |
parent | 9730aee854a9cb3b67bdb423c8a7082dda1cfe06 [diff] | |
parent | 15e4c3012ca37a3e0353ba15094f52f6dac165db [diff] |
Merge "stagefright: define mpeg2 HighP level constant am: 9e332babb9 am: 6c25a7752d" into nyc-mr1-dev-plus-aosp