OSDN Git Service

Merge changes I73a39c6d,Iab2af242 am: f30170dfa5
authorJosh Gao <jmgao@google.com>
Fri, 20 Nov 2015 02:04:44 +0000 (02:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Nov 2015 02:04:44 +0000 (02:04 +0000)
commit8e7429ca5e9be4c938acdc22ab041db32574e07d
tree03f22bdbe50c635b69d49558175e683665e72bdf
parentbc47b95f25dfedbbc7cdf7cc309cdb969f4e5c8d
parent8af9a739c985d63fcf0e3b5ddd051b597f1af44e
Merge changes I73a39c6d,Iab2af242 am: f30170dfa5
am: 8af9a739c9

* commit '8af9a739c985d63fcf0e3b5ddd051b597f1af44e':
  Fix test build break.
  extend the PTRDIFF_MAX size check to mremap