tree df74fcfad62bf909a7aba9bfdcfe08562c46c950
parent 8a3dff0d8679a8ef22492961456a6c87d2fe31f0
parent 869a72294dbbdf4b56e99059f3f156727dcd0492
author Bill Yi <byi@google.com> 1501283940 +0000
committer android-build-merger <android-build-merger@google.com> 1501283940 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 869a72294d  -s ours

Change-Id: Id38ad6e5444b3c3daf124375fe02183073343ce9