tree c1332e813cd72b7102058292970c488f9856c5c8
parent 216ce34d045cde0c5383f844ba0375aac476cb9e
parent 674fd6c442cd3886b3ab12be1d36c5d05ef48cdb
author Brian Carlstrom <bdc@google.com> 1394050192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394050192 +0000

am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

* commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb':
  Add dex2oat-flags plumbing to AndroidRuntime