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

am: 96cf13a10b  -s ours

Change-Id: Ic6ff81c3fb2e680ceaa84d1d6d85c8947fe0cf48
This commit is contained in:
Bill Yi 2016-06-30 21:57:47 +00:00 committed by android-build-merger
commit 5c8b2fabfe

Diff content is not available