tree 9f954d1838fee56625603f09cd0e93c011c32d4c
parent 6f89ab02620d018ede782861ed9fc1610276e400
parent 1d40d9ea62b8c37cf904108ae886bfba5dac0d84
author Benoit Lamarche <benoitlamarche@google.com> 1428511851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428511851 +0000

am 1d40d9ea: am 7b153a1d: Merge "Fix potential dex index overflow in dx" into lmp-mr1-dev

* commit '1d40d9ea62b8c37cf904108ae886bfba5dac0d84':
  Fix potential dex index overflow in dx