| commit | f363382805f6c89163728147491f650e34fe6314 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 22:23:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 22:23:24 2014 +0000 |
| tree | a19512606ff5e2dcce842c702477718d037baf83 | |
| parent | a9f6048a94a4a7edb36955693ecba5e5c858e303 [diff] | |
| parent | 20ed21a5d52fe2a6b1d86bbeb3ca447d7f8aa6dc [diff] |
am 20ed21a5: (-s ours) am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '20ed21a5d52fe2a6b1d86bbeb3ca447d7f8aa6dc': Import translations. DO NOT MERGE