| commit | fe9aed1afee625e5b5ce5343d8d7cee7fd0eb4fb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 29 22:52:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:52:58 2014 +0000 |
| tree | 0996b306beef33af2aa29ec6ee8c7ebc0b86cc5f | |
| parent | b91cdf62d46a3bfb4fdb999bb7b993c856f1d79e [diff] | |
| parent | 185ba9de2a5b5abf3fa47d431d0729983380894e [diff] |
am 4fce1171: (-s ours) am f543d669: (-s ours) Import translations. DO NOT MERGE * commit '4fce1171a92cf0f2e75a971fac5ffabe80f04f1f': Import translations. DO NOT MERGE