| commit | 1ddf42670d30c193920965d6a2f89d57d659d5e8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 12:52:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 12:52:12 2015 +0000 |
| tree | 3a88203e844418d8804e94cd44c14a9cb99482c9 | |
| parent | d50f67e320187ae38fa272baefc018b0b01fa7a2 [diff] | |
| parent | a30d33a223d05f942f15e48e3764fae2b64e8cc7 [diff] |
am 32e0b1df: (-s ours) am 5aaefd0a: (-s ours) Import translations. DO NOT MERGE * commit '32e0b1dfba24e15da31aec979219c32c1ba43a29': Import translations. DO NOT MERGE