tree 32a993b20fe582f25a084c502a836da8b4ae91fc
parent 72d7d9a5bcabb91101a404100d7be2ea37eebfc9
parent 8d1d88a6c082bfcf14bd4341b9e84497dc1ac179
author Android Build Merger (Role) <android-build-merger@google.com> 1461102571 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461102571 +0000

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