| commit | 40413bbbe3b3b5dcfb9ed49e78445a3b7496f4f9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:07 2015 +0000 |
| tree | 425acb1618f7e6e9d0067e8ed4255ac5bedf7318 | |
| parent | 0ff7bd76d62c8653b02b7cabe1e5178dcf0cf39f [diff] | |
| parent | 3104ca23a0976a402a758c70d75b29197a924c77 [diff] |
am 3104ca23: (-s ours) am a66673b7: (-s ours) Import translations. DO NOT MERGE * commit '3104ca23a0976a402a758c70d75b29197a924c77': Import translations. DO NOT MERGE