| commit | d368e81988636b834f312a6411e58cad2b9143db | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jul 23 21:43:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 23 21:43:45 2014 +0000 |
| tree | 6787bd2fe33fc94fbfc4896e444a0c277eb55446 | |
| parent | 24078acfe850a7b37e31aaa3ae87ccb6826cabef [diff] | |
| parent | b94ed50a53ecbfbd360a2771a22ec91283b9a5f3 [diff] |
am b94ed50a: resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp * commit 'b94ed50a53ecbfbd360a2771a22ec91283b9a5f3': Recycle mem-maps for collector transitions.