commit | bc86a0b6fe6b1065a0c7b58744e460d2d558cfba | [log] [tgz] |
---|---|---|
author | Shubham Ajmera <shubhamajmera@google.com> | Mon Jul 24 21:00:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 21:00:15 2017 +0000 |
tree | 2096e23ba60f1b3dcd2fc8c7e33ab1ddf2558c38 | |
parent | 34688278042ce255bbf68037eaf7bb18097ee3ba [diff] | |
parent | 507ebef78f5e5b41cf0771fce5da5e13d5ce3d5c [diff] |
Merge "Merge "Merge "Update DexFile#getDexOptNeeded usages to reflect API change" am: 515e6443aa -s ours am: 925a08df7c am: 1195d66081" into oc-dr1-dev-plus-aosp am: 054e95e386 -s ours" into oc-mr1-dev-plus-aosp am: 507ebef78f -s ours Change-Id: I037b1091a96d82ac89954e6902d630d08f0418a9