tree bbd383d640980981c61c24fe07055df52f0b215b
parent ff25d42b56b48327f5c30ac0eb5131e16302130a
parent d463b7ac9a06c291032b4fad3d88f690c32b4e71
author Bill Yi <byi@google.com> 1474082478 +0000
committer android-build-merger <android-build-merger@google.com> 1474082478 +0000

Import translations. DO NOT MERGE am: db98ef8040  -s ours am: 5fccacc286  -s ours
am: d463b7ac9a  -s ours

Change-Id: Ic46c0dcd40949c06090e4bfe8c61925cfecaba96