OSDN Git Service

Merge "No more ashmem equivalent checker false alarm" into oc-dev
authorPeng Xu <pengxu@google.com>
Thu, 8 Jun 2017 10:23:02 +0000 (10:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 10:23:02 +0000 (10:23 +0000)
am: d6d91e5833

Change-Id: I754b5d0d1e9426efa07821eba8a6ca6c826914cf


Trivial merge