Flush changes before invalidate in memory mapping tests am: e73ac75e3c am: 0257d9458a
authorMika Isojrvi <misojarvi@google.com>
Fri, 27 May 2016 23:17:05 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 23:17:05 +0000 (23:17 +0000)
am: 508ae6d9f1

* commit '508ae6d9f1d37335b4c286b6d46a40e4d2f10b8a':

Change-Id: I0134a429f69897af6d70b73f2e472260d87cc495


Trivial merge