tree 0779bf051a80d608d4ecbab277d86e947374158b
parent 02662a120991c4425cf8e62df39906bdc5512bc4
parent 3cca5a0cae1a1255458c17a4134ca65ea25852c1
author Bill Yi <byi@google.com> 1476436974 +0000
committer android-build-merger <android-build-merger@google.com> 1476436974 +0000

Import translations. DO NOT MERGE
am: 3cca5a0cae  -s ours

Change-Id: Iafd1f484aa07db9cdde2e934a8bfb3dc24e61725