OSDN Git Service

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
authorLajos Molnar <lajos@google.com>
Fri, 9 Sep 2016 16:51:06 +0000 (16:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Sep 2016 16:51:07 +0000 (16:51 +0000)
commit7c36c95b19a98a17cc1f132f4818142b3969272d
tree6759d4221bd6976048f8f281c6f864c2387a03e7
parenta7549d3dce0b313c8d22d54e43217d822393e5ae
parent9a4768f7bfcd4654f93ad9b22eff87df493a9d5e
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev

* changes:
  DO NOT MERGE: IOMX: work against metadata buffer spoofing
  DO NOT MERGE omx: check buffer port before using