tree c2ad52888bba6eb568fb304312b7a9b167291f7f
parent 931d38bda07e561e8797d57e971afaaecfb461ce
parent 38bd4e8a779949a9ba9abe9baa18b0206f4b4b9e
author Bill Yi <byi@google.com> 1474146503 +0000
committer android-build-merger <android-build-merger@google.com> 1474146503 +0000

Import translations. DO NOT MERGE am: 46bf87f2b7  -s ours am: 83ccd60392  -s ours
am: 38bd4e8a77  -s ours

Change-Id: I6999f9a8b60ed45a6aef3f23b3a3dfd412b93307