tree 8a74acd0efe080a72eacccedd94aea0e1a21fb1c
parent e06e84710bf5e65f3e42c937792905bbee431140
parent 3c774bdbf5dd6201d97789345faaf8cf9e5d94c7
author Bill Yi <byi@google.com> 1482369787 +0000
committer android-build-merger <android-build-merger@google.com> 1482369787 +0000

Import translations. DO NOT MERGE am: dfb6ca8235  -s ours am: 529015a5ca  -s ours
am: 3c774bdbf5  -s ours

Change-Id: Id67eb8922c00b10147cbf74f982098f4f7e20d23