Merge "Take nonCoherentAtomSize into account in memory mapping tests am: 81fe3f5a2c...
authorMika Isojärvi <misojarvi@google.com>
Fri, 27 May 2016 21:19:20 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 21:19:20 +0000 (21:19 +0000)
am: b19f87d64e

* commit 'b19f87d64e804b0984d97b87844db3dd9fb6b68d':

Change-Id: Ic3fdaba128ceb6bf3768c39142ba6623fa9ab13d


Trivial merge