tree 9f03c511683e3847364d5bab1147e91c50ff6fc2
parent 5cca5338d5a3baa5500744e36bbdeb5f1b202623
parent 76e2fe9d4d9d62d5abd7f0f484ffe310553cddd3
author Jesse Evans <jsje@google.com> 1491329337 +0000
committer android-build-merger <android-build-merger@google.com> 1491329337 +0000

Merge "Merge "Load IA resolver settings from resolver package" into oc-dev am: 7f654b2776" into oc-dev-plus-aosp
am: 76e2fe9d4d

Change-Id: I88fb622d6a937f75fe27f5d3efa826f7e17faff3