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

am: 721e972633  -s ours

Change-Id: Ia1d0f2fef183cc0f81902bbf5c5a229d5b6436b4
This commit is contained in:
Bill Yi 2016-06-17 05:02:47 +00:00 committed by android-build-merger
commit 7942663bc6

Diff content is not available