tree d690a07c52ede7adb6518ec63b9279f89764c9a3
parent a22473adbb8f6c10df20aa7c507bfd116f78cd53
parent cdb70c56daa89497ea3561fb0869d13f1d6c5d39
author Calin Juravle <calin@google.com> 1495142410 +0000
committer android-build-merger <android-build-merger@google.com> 1495142410 +0000

Merge "Also return vdex file from DexFile.getDexFileOutputPath" am: a654e0378a
am: cdb70c56da

Change-Id: Ia2c34ef8b9d744d41792a7bd279f2575a860af21