Merge "Import translations. DO NOT MERGE am: 6a94ca634d -s ours am: 072c1a9eb9 -s ours am: b3e5afe27d -s ours am: 7b2fbdc2fb -s ours" into nyc-mr1-dev-plus-aosp

am: 751adfa57f  -s ours

Change-Id: I14322e87d233d9cd968ded5d3f7be15de2060ac8
This commit is contained in:
Bill Yi 2016-08-15 20:38:49 +00:00 committed by android-build-merger
commit 813ea93525

Diff content is not available