tree 12f81a1efe841dbe5a7ec32fab725f1ff9e4945a
parent 0d221d39c566538be1b6b3d04449f2c5bad3fd47
parent bdc9f325b6eb97f674217bb0de51765e71b7023e
author Bill Yi <byi@google.com> 1470664330 +0000
committer android-build-merger <android-build-merger@google.com> 1470664330 +0000

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

Change-Id: Ic98dbbf379ff42d73a0db7c96283ad5e6c1fe4e5