tree 3d880e7042b7414146ecbcee6ae17e472870c831
parent 53673262336e13be0116427a16b5baba0d630af2
parent 957c65fe137b02a1a57833746b4e9655e22ff1a1
author Bill Yi <byi@google.com> 1469813384 +0000
committer android-build-merger <android-build-merger@google.com> 1469813384 +0000

Import translations. DO NOT MERGE am: d730a04ef7  -s ours am: db360b65d4  -s ours
am: 957c65fe13  -s ours

Change-Id: I771471e5f08471ff6c6a3f5c9c34d6d1428acd16