Fixes to random memory mapping tests am: 223b8f6911 am: c277f941dd
authorMika Isojrvi <misojarvi@google.com>
Sat, 28 May 2016 00:37:59 +0000 (00:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 28 May 2016 00:37:59 +0000 (00:37 +0000)
am: 2996c7f493

* commit '2996c7f4933ff1272451e5545fc47f43f0cf367d':

Change-Id: Id1462b89bb79e8e3895742e5c5b1b600f472109b


Trivial merge