| commit | 78ab71eca0b8562fe280eae9ad8744c620de1ebc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 15:40:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 15:40:34 2014 +0000 |
| tree | 7dbf140631a78d1664b1e161be3f39653b4548d2 | |
| parent | 13d3b38e5720fb976c55eb5a53e061c05511de55 [diff] | |
| parent | 91024f55de91db0d9124605b0bedf778fb65c6ae [diff] |
am 91024f55: (-s ours) am d896f661: (-s ours) am 4dbd3a23: (-s ours) Import translations. DO NOT MERGE * commit '91024f55de91db0d9124605b0bedf778fb65c6ae': Import translations. DO NOT MERGE