| commit | 3f51f9bddda3538d2215cd1270c362dd63b7e64b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:44:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:44:21 2014 +0000 |
| tree | 7115d80b14a6d1255a470c24c7a42a3ecfb90c2b | |
| parent | 7b664a3773874976a625bc245f30d310cb72dee7 [diff] | |
| parent | 49f1dba5a829829456871362469190da334aaed2 [diff] |
am 49f1dba5: (-s ours) am 2b93e202: (-s ours) Import translations. DO NOT MERGE * commit '49f1dba5a829829456871362469190da334aaed2': Import translations. DO NOT MERGE