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)
commitb19f87d64e804b0984d97b87844db3dd9fb6b68d
tree93e463603378f6f4f2931f5c86d0bfac2ec79bd3
parent10f018138c56bcb7a06d9e91163acf8ab9f40957
parentfccacd9fb4ea571c877aaaeac593e332d504cfbe
Merge "Take nonCoherentAtomSize into account in memory mapping tests am: 81fe3f5a2c am: 0a2cce9dfb" into nyc-mr1-dev-plus-aosp