tree 0f18cd641bccadd904e82290bcb05d2459248357
parent c6e4ff90c3fcf3c6973332ab7a43f8f767620c0b
parent 95108c9e8a55d113ada37b2fed8c3d8da4fcbcdc
author Andrew Sapperstein <asapperstein@google.com> 1556052034 -0700
committer android-build-merger <android-build-merger@google.com> 1556052034 -0700

Merge "Fix multiple string substitutions"
am: 95108c9e8a

Change-Id: I8adf25e224f5e613d3154dc8b4f0434d1551bd1a