tree 9bf1b2dee95f44462de37938d69ff37af9e50173
parent 2ec35cc88f10bcd11d3a193d58a1ab245caebce5
parent 1844701942de578bab6c7f17e14ef695bb8ed7c1
author David 'Digit' Turner <digit@android.com> 1308832088 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308832088 -0700

am 18447019: am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"

* commit '1844701942de578bab6c7f17e14ef695bb8ed7c1':
  emulator: Enable dex-preoptimization