Merge "Take nonCoherentAtomSize into account in memory mapping tests am: 81fe3f5a2c...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 27 May 2016 20:39:27 +0000 (20:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 20:39:27 +0000 (20:39 +0000)

Trivial merge