tree 22476a40a4655f4801ae57265a938039a9dfbb4b
parent 37751c58bf12d51a96ea0f8ffae2ccd1090f00b8
parent 57fbac14c4a07e717890ae5d8ee7bf4a88ee795d
author Bill Yi <byi@google.com> 1523974630 -0700
committer android-build-merger <android-build-merger@google.com> 1523974630 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 57fbac14c4  -s ours

Change-Id: Ia2660a67af0c42548fbb96259cfac7a1734f468a