tree c3febd7e94caccfc7796519ce26af0162c9f412c
parent 6cf111906e1f1e20873cac1e1a453bbec35d2d37
parent f8307035e04bfa35cff6004ea27d940888675241
author Guang Zhu <guangzhu@google.com> 1496422827 +0000
committer android-build-merger <android-build-merger@google.com> 1496422827 +0000

Merge "Update configurations to avoid using ApkInstaller" into oc-dev am: aeace3fce9
am: f8307035e0  -s ours

Change-Id: Icb3e0820ebbaad36f3a16bf2353fb581ba5ecf50