tree 48d72c76db37e1177991a988c68708e6f64b892f
parent d3b5d574defd565d6e810cbb86e3943837f94065
parent 8a7496060df85c241b976d6cd69b13828e452ef9
author Brian Carlstrom <bdc@google.com> 1404909391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404909391 +0000

am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"

* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]