tree 59fcc787f189420507b8e5b59e24bc882e4e0c07
parent 65adcb9e7f779f9a6fe9d097768c9fd0f6170b32
parent 8fdf4e0f5bfbeb2bc785558315f14a6450f6bd0c
author Mathieu Chartier <mathieuc@google.com> 1548888282 -0800
committer android-build-merger <android-build-merger@google.com> 1548888282 -0800

Merge "Enable resolution of startup const-string for non user builds"
am: 8fdf4e0f5b

Change-Id: Ia82d22d35bbc051fbcddd87bcab88c682c02cbf9