| commit | f4ddb06ec2b43d83b9c435a510efbedbbe80d577 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 22 12:53:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 12:53:47 2015 +0000 |
| tree | c82d17e5ca4de615e1882c7b0bbe16767d690584 | |
| parent | 9c0a92e6a032a93d6c2dcdfc62ec62def0269d12 [diff] | |
| parent | fece743fee904e97a8ea89acc6354915c729885f [diff] |
am fece743f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'fece743fee904e97a8ea89acc6354915c729885f': Import translations. DO NOT MERGE