tree 7432fc50385dba5c94bcaf8f60e561597e5e6ceb
parent 59c27f95502565a47d0a6ae5d66a075b7d893b2e
parent 0771b752f1b955e7ded6ccbbf825b0ae93439eb5
author Yi Kong <yikong@google.com> 1551407351 -0800
committer android-build-merger <android-build-merger@google.com> 1551407351 -0800

Merge "Workaround string-plus-int warning"
am: 0771b752f1

Change-Id: I8d54690771c35612a15712ee9d260f82d76671ae