| commit | e5ac4f69e52396216dff8f22a1ca4283add1b1d5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 15:48:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 15:48:53 2014 +0000 |
| tree | c380264f3aa95e3e2385a5eeb8abe1d8072db709 | |
| parent | 67143861b53e4bface2ffa097021a2d43b055b56 [diff] | |
| parent | 9806c2db770feed9c65af86e0835ed9b4bde3c3e [diff] |
am 9806c2db: (-s ours) am 034f1da2: (-s ours) am f8fd72ea: (-s ours) Import translations. DO NOT MERGE * commit '9806c2db770feed9c65af86e0835ed9b4bde3c3e': Import translations. DO NOT MERGE