tree 2858b71af546232dcb2a9a883cb6554b45107d52
parent b75b082e7f1fa896e6b972fe0da1106801392cb3
parent 9331af7220051a5a830b3df101f6e2397454dbb7
author Bill Yi <byi@google.com> 1521300971 +0000
committer android-build-merger <android-build-merger@google.com> 1521300971 +0000

Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9331af7220  -s ours

Change-Id: Ib91e7e1c4c5a066c2191c29ad1f6df7ca7a0f14f