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

am: 9b14186afe  -s ours

Change-Id: If6ba57a9d3afea7a6f76d0986988fbc9dbb70b6a
This commit is contained in:
Bill Yi 2016-06-30 22:05:28 +00:00 committed by android-build-merger
commit 0cf9428986

Diff content is not available