OSDN Git Service

Merge changes from topic 'secondary-dex' am: ad79651822
authorCalin Juravle <calin@google.com>
Fri, 3 Mar 2017 00:30:34 +0000 (00:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Mar 2017 00:30:34 +0000 (00:30 +0000)
commit431856d7a60bdf1dc1dc0a5fe715d7512291fd5e
tree3ff6acd82c11e6d22aa5f51f2f02b9024ed343e4
parent64f3d11dd773b89b93de3764f55c6a0a6328f4ff
parentba1d417ecab84b0638db460eeceed909a2bf32e5
Merge changes from topic 'secondary-dex' am: ad79651822
am: ba1d417eca

Change-Id: Ie579b31a131b475449fec93f0bf5527677022edd