| commit | a83708c211673f0f5b218a8f994aa82bc937d5cb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 16 17:16:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 16 17:16:47 2015 +0000 |
| tree | 4077bf3e6269d5d99a03a94d6d9a6d898f42e873 | |
| parent | 504bdd80943fad97adaa1060457680aceabace90 [diff] | |
| parent | 9bf1c310132b914dcd7bb760ac68a0833374e6cb [diff] |
am 9bf1c310: (-s ours) Import translations. DO NOT MERGE automerge: f27b985 -s ours * commit '9bf1c310132b914dcd7bb760ac68a0833374e6cb': Import translations. DO NOT MERGE