Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev

am: e5eed9ed61  -s ours

Change-Id: I3da9d4d737f0aaa57aef597dfe30a50cfe576587
This commit is contained in:
Bill Yi 2016-07-21 03:35:46 +00:00 committed by android-build-merger
commit d2cca3f1c4

Diff content is not available