tree 54948ddcffdd6d2bd01232f73cc0a0c3a81ec8ee
parent 15b2bdde62a97ded2530e32ff1e5b983c0ac0598
parent a427ca6f68e9b944f7e3280e2459e2ee590b5803
author Bill Yi <byi@google.com> 1475608183 +0000
committer android-build-merger <android-build-merger@google.com> 1475608183 +0000

Import translations. DO NOT MERGE am: 695256240e  -s ours
am: a427ca6f68  -s ours

Change-Id: If6018c0e330695c718593fe3f6e8208e2638e178