tree e2696077ae7fff5fc288df561c06a51629ad643d
parent adcd83ffb74c6776aab826d6de76fe4aa237db08
parent a6e599a8838b7d8098cba12301422e0fb6296753
author Sebastien Hertz <shertz@google.com> 1414528240 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414528240 +0000

am a6e599a8: Merge "Fix JDWP Virtualmachine.Resume command" into lmp-mr1-dev

* commit 'a6e599a8838b7d8098cba12301422e0fb6296753':
  Fix JDWP Virtualmachine.Resume command