tree fbe50ea3dabe8c31db654ac092efb45952d9210a
parent cb1ad445663d190e204330b596b52e4734d9dcf0
parent d3737d07c8adb0848dcddb7df03d1e6b4378ab93
author Brian Carlstrom <bdc@google.com> 1390942337 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390942337 +0000

am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"

* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA