Fixes to random memory mapping tests am: 223b8f6911
authorMika Isojärvi <misojarvi@google.com>
Sat, 28 May 2016 00:11:52 +0000 (00:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 28 May 2016 00:11:52 +0000 (00:11 +0000)
am: c277f941dd

* commit 'c277f941dd00ab3f9cd0d7aff3028f5c18a5ebb5':

Change-Id: I38c50df26568d40cfb928ab88194deec03e97554


Trivial merge