Merge "Add check to ensure memory and heap with DEVICE_LOCAL flags are consistent...
authorDavid Sodman <dsodman@google.com>
Mon, 21 Mar 2016 21:23:47 +0000 (21:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 21:23:47 +0000 (21:23 +0000)
commitefdeb33d6410431eda6dc5594a211507b898ae58
tree54115d350a31493f534d434a823d20770c3dd060
parent2c1d6e7845ec1e1c95e95563077f5484c060b334
parentbc45f78fd3231e8c26f2a29b695dc72c1a4f22f1
Merge "Add check to ensure memory and heap with DEVICE_LOCAL flags are consistent" into nyc-dev
am: bc45f78

* commit 'bc45f78fd3231e8c26f2a29b695dc72c1a4f22f1':
  Add check to ensure memory and heap with DEVICE_LOCAL flags are consistent