tree cfdd730fb402580c006995d5694528fb7b02d8f9
parent abbd2ea62e490d60a0bf680e7b110a53a8c910ed
parent 58de514b160674a483bcb912d367072c7354cc1e
author Elliott Hughes <enh@google.com> 1375293861 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375293861 -0700

am 58de514b: Merge "Fix Class.getDex."

* commit '58de514b160674a483bcb912d367072c7354cc1e':
  Fix Class.getDex.