tree e9e8885e7567d3014fc7a406a49f41f6a2b6bc90
parent 5c4c68da547d0031a2c43a6e0a35f6c8b9e1f5c0
parent f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79
author Mathieu Chartier <mathieuc@google.com> 1386029132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386029132 +0000

am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."

* commit 'f3a2430a2b849f2c4041bcfba7fbefa9b2bb4d79':
  Add dalvik.vm.gctype to enable switching between different GCs.