OSDN Git Service

am b94ed50a: resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Wed, 23 Jul 2014 21:43:45 +0000 (21:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 21:43:45 +0000 (21:43 +0000)
commitd368e81988636b834f312a6411e58cad2b9143db
tree6787bd2fe33fc94fbfc4896e444a0c277eb55446
parent24078acfe850a7b37e31aaa3ae87ccb6826cabef
parentb94ed50a53ecbfbd360a2771a22ec91283b9a5f3
am b94ed50a: resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp

* commit 'b94ed50a53ecbfbd360a2771a22ec91283b9a5f3':
  Recycle mem-maps for collector transitions.