tree 54aacc8f75a71d52a4815ee0b9846cbb8cfd2ef4
parent e5d9dca16fa629d5cf5bdac38199de8052eb8336
parent 5aba0149b953fb8e85851811dde995fb35c10051
author Brian Carlstrom <bdc@google.com> 1404909407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404909407 +0000

am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit '5aba0149b953fb8e85851811dde995fb35c10051':
  Make dex2oat heap size product configurable [frameworks/base]