tree 5b6e9a941e41ebaa08559196a3798b15f519c5a3
parent 5105505efd35c6b2d934794b550538e4f18cf70d
parent 12318b5b4e63c1ba034d51a7a64abdf8169c13c3
author Ben Schwartz <bemasc@google.com> 1507122283 +0000
committer android-build-merger <android-build-merger@google.com> 1507122283 +0000

Merge "New function signature for setResolverConfiguration" am: 8052930f4f
am: 12318b5b4e

Change-Id: I12d721a809646070900f81723a4d10f4635fec15