Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 80eee73afb -s ours

am: a461b81a54  -s ours

Change-Id: I42c756fa6a969bae7570dfbdf2378c8ac9ea23db
This commit is contained in:
Bill Yi 2016-06-30 21:52:41 +00:00 committed by android-build-merger
commit 96cf13a10b

Diff content is not available