tree a28e53d8179b335127a0442cbe5224f4fba9708c
parent d1e4ece2c309a081eecf24cdb402f3313e3f128b
parent e77c92c9914bb3ca9c7fd4f7d4ed7ead305d6d0a
author Bill Yi <byi@google.com> 1494658664 +0000
committer android-build-merger <android-build-merger@google.com> 1494658664 +0000

Import translations. DO NOT MERGE am: 3b2d98c714  -s ours
am: e77c92c991  -s ours

Change-Id: Ie39f8fff5d0c92826a21958abde00034b9d481db