| commit | 00a4b8e6ed434f405e60cbf2edae676bcfa74d36 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:27 2015 +0000 |
| tree | 4f834f149f47318a4fb975b9ac0b183d16b783d5 | |
| parent | d155209ab2f4dbed3f59b942bbad1beea181d48e [diff] | |
| parent | 40413bbbe3b3b5dcfb9ed49e78445a3b7496f4f9 [diff] |
am 40413bbb: (-s ours) am 3104ca23: (-s ours) am a66673b7: (-s ours) Import translations. DO NOT MERGE * commit '40413bbbe3b3b5dcfb9ed49e78445a3b7496f4f9': Import translations. DO NOT MERGE