tree 32a993b20fe582f25a084c502a836da8b4ae91fc
parent 5d2e7eb3b21086a73c0824f9aa7cd14859045e3b
parent a7e455a711d5d6156d51b7243bcd8891629229b3
author Christopher Ferris <cferris@google.com> 1461102763 +0000
committer android-build-merger <android-build-merger@google.com> 1461102763 +0000

Merge "Update address space of map if it changes. am: b5ab758 am: 292f21f" into nyc-mr1-dev-plus-aosp
am: a7e455a

* commit 'a7e455a711d5d6156d51b7243bcd8891629229b3':

Change-Id: I7cc9acc0e440fdbd485895fe75a7b01ea3fb0fa1