tree bbd383d640980981c61c24fe07055df52f0b215b
parent fd74a53cb280fbb6327a912b1f7ddf7ffeef9bb6
parent 31f1ed60e2891ddfc3f6f1ab7604392b95990468
author Bill Yi <byi@google.com> 1470421307 +0000
committer android-build-merger <android-build-merger@google.com> 1470421307 +0000

Import translations. DO NOT MERGE am: 079f2c6e13  -s ours am: 1cc7738bfe  -s ours
am: 31f1ed60e2  -s ours

Change-Id: I49c4df389a46601a730daecccc595355a9a42f54