tree 7df3a271cd71e6200c1abd60cd0611cf2ff99cab
parent 28da658d1ebd806fcf1632f0eb2a9871fdfc4fbe
parent f60773b22d76fbca295f7286873a974480a5fd30
author Jeff Davidson <jpd@google.com> 1498525205 +0000
committer android-build-merger <android-build-merger@google.com> 1498525205 +0000

Merge "Pass calling package to resolution UI." into oc-dr1-dev am: 776220d029
am: f60773b22d

Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57