tree 93bc72c4bfbc7da41d43bae78b4e593e192ea749
parent b00e6c5dd29db0b0888558ad42800565b0c7e1a8
parent aaf66873eefa133accbd40df8630430e5e1f4871
author Baligh Uddin <baligh@google.com> 1426893399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893399 +0000

am aaf66873: (-s ours) am e1e0f52f: (-s ours) am 47e76760: (-s ours) am d447b639: (-s ours) am 00a32fe1: (-s ours) Import translations. DO NOT MERGE

* commit 'aaf66873eefa133accbd40df8630430e5e1f4871':