tree e663032539dc2886caee6acc25e06a26c230e77d
parent 5729a4939a5d3952142aa761e524197290942a66
parent 97adeb16aa08a4d0e8b63aea38607c179e808d18
author Mathieu Chartier <mathieuc@google.com> 1548889759 -0800
committer android-build-merger <android-build-merger@google.com> 1548889759 -0800

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

Change-Id: I81a890f0cd01b8b20e77d676386b4aada5e70847