OSDN Git Service

am c54e12a4: (-s ours) Change MemMap::maps_ to not be global variable
authorMathieu Chartier <mathieuc@google.com>
Tue, 14 Oct 2014 23:48:03 +0000 (23:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Oct 2014 23:48:03 +0000 (23:48 +0000)
* commit 'c54e12a413e16f90526318f1f466a900a717fbb0':
  Change MemMap::maps_ to not be global variable


Trivial merge