tree 961f9f6b5630cd28f8a8da2f1cb9e3b81684276e
parent 2010f84297e6712664561a976854fe7f64fcb2d0
parent c9b04168426f55d74a3de0bdb851307ea511a315
author Bill Yi <byi@google.com> 1505590217 +0000
committer android-build-merger <android-build-merger@google.com> 1505590217 +0000

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

Change-Id: Iff8a53fb5034b4c1829ccfa045015f9f45241e2d