tree a1d87b4d21aeb58a3548d1ab29787f68ac06d179
parent 4f082a4db703d41e1b39f8a74d1bbc9995b02cd5
parent 876e6f242093737d6abdd7b2d015c3159deb148a
author Bill Yi <byi@google.com> 1469076638 +0000
committer android-build-merger <android-build-merger@google.com> 1469076638 +0000

Import translations. DO NOT MERGE
am: 876e6f2420  -s ours

Change-Id: I4790fa4908214b8d6c923c331802726eb980cd25