tree 134e81544019e9f0d6a78a6ef552136265a98a6e
parent c88da7cc21c61b9ac8fcac11aa812f647ffb181c
parent d441dbc6436dbf8cb13f0b784c7d16f022b7586e
author Brian Carlstrom <bdc@google.com> 1404918458 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404918458 +0000

am d441dbc6: am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]"

* commit 'd441dbc6436dbf8cb13f0b784c7d16f022b7586e':
  Make dex2oat heap size product configurable [frameworks/native]