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

am: 982b7c6e75  -s ours

Change-Id: I7f1db33517b7dedf9efe99d4141edcebe3cf6054
This commit is contained in:
Bill Yi 2016-06-17 00:09:25 +00:00 committed by android-build-merger
commit 54231dfd68

Diff content is not available