tree 6b0d0946a5beb5767172d3145330c257aadd4da6
parent d9cdfcdbe8673fdb06f796188a21c8f31238f876
parent 5487984da5ff80b9ad4194215f9e065ab7aa2b87
author hughchen <hughchen@google.com> 1526412736 -0700
committer android-build-merger <android-build-merger@google.com> 1526412736 -0700

Merge "Add and update string" into pi-dev am: ef9b8cda82
am: 5487984da5

Change-Id: I2844fcdf4bf053434d4f5a57e367dfe1a3bf7b97