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