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)
am: bc45f78

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


Trivial merge