Merge "Import translations. DO NOT MERGE am: 4bf388ecbd -s ours am: 9441334fce -s ours am: a4ec12c9d9 -s ours am: 873a7d6569 -s ours" into nyc-mr1-dev-plus-aosp

am: dfc3a50e8a  -s ours

Change-Id: I42c8e5d72b16ec71b74bc396b7f7eefdd90def41
main
Bill Yi 2016-08-15 20:43:44 +00:00 committed by android-build-merger
commit feaaa27916

Diff Content Not Available