| commit | 61a104acfe6f3651f61368f932cabd1723f417b9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:03:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:03:10 2015 +0000 |
| tree | 17d92fadd67b4037d76382db6dd59970ff8632c0 | |
| parent | d950e6ed3bc86dce40fad13c53a4e20d2be481b1 [diff] | |
| parent | 13bcea0698f8efb37adbbe0bf3257afcb3c7fee0 [diff] |
am 6655e136: (-s ours) am 34376003: (-s ours) Import translations. DO NOT MERGE * commit '6655e1368ae322f1aa7f4fd681c4946cbd731846': Import translations. DO NOT MERGE