| commit | 516a91d8acd8ee23ae0296a51c521acaa561fed3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:57:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:57:37 2015 +0000 |
| tree | 4ce3215693926ab94279f50f6c8520e4f05ca1fd | |
| parent | a9a06f566a434848961a0fbd516526e11fd8d2d4 [diff] | |
| parent | c9e9eca8271d1b721e3ec8ebaeaf846df491ad64 [diff] |
am c9e9eca8: (-s ours) am accfcfe3: (-s ours) am d28d0006: (-s ours) Import translations. DO NOT MERGE * commit 'c9e9eca8271d1b721e3ec8ebaeaf846df491ad64': Import translations. DO NOT MERGE