tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent 179fab5e9cfb1467a594a0a51f2038f1ec653e0c
parent c92d3711042f6317fe11985ac9199a637708bbe3
author Bill Yi <byi@google.com> 1470421740 +0000
committer android-build-merger <android-build-merger@google.com> 1470421740 +0000

Import translations. DO NOT MERGE
am: c92d371104  -s ours

Change-Id: Icfefcf9f302f18954ae85bf7103a330de8f0fcfb