am c36c95df: (-s ours) am fbe720eb: (-s ours) am 7fb3e8b4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit 'c36c95df8b253eb742ea7f265b6014545780b764':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2015-02-27 16:53:15 +00:00 committed by Android Git Automerger
commit 066c2e0bff

Diff content is not available