diff options
| author | Marco Nelissen <marcone@google.com> | 2015-10-22 22:27:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 22:27:51 +0000 |
| commit | 6e5e56a39512c65001789f33afae25956f437cce (patch) | |
| tree | aa909d340da83222a14428a89622bcfbc1645628 | |
| parent | ac0318fa8afe20b00342d41d10e0054f9a8f541a (diff) | |
| parent | b3a53cebdb51e50fe7ddd670b306271268f19d18 (diff) | |
| download | platform_external_libhevc-marshmallow-mr1-dev.tar.gz platform_external_libhevc-marshmallow-mr1-dev.tar.bz2 platform_external_libhevc-marshmallow-mr1-dev.zip | |
resolve merge conflicts of 7899c8cffa to mnc-dev.marshmallow-mr1-dev
am: b3a53cebdb
* commit 'b3a53cebdb51e50fe7ddd670b306271268f19d18':
Aligned ps_pic_pu to 4 bytes
0 files changed, 0 insertions, 0 deletions