tree c8ba986991061c7c5ea88ceba02027d52f9f07f9
parent a5d620ae92533783f128332278458bb5fae6452d
parent 9f05e68ea5130d9de4688d329346deb48a115e9d
author Bill Yi <byi@google.com> 1506615549 +0000
committer android-build-merger <android-build-merger@google.com> 1506615549 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf  -s ours
am: 9f05e68ea5  -s ours

Change-Id: I6de282dbe84110fef47a069ad6cd2dc17e9bea7f