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