| commit | 42c03c213fddaa75e759ddea186bb28236ec80b1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 14 19:24:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 19:24:24 2015 +0000 |
| tree | 6b42b0e35d6973064be0f779a9d937cf42899695 | |
| parent | 2b3dadfc32330317f90f4cb2dcf0c9727a28208e [diff] | |
| parent | 1ccf87793b7b3a82f0fcfff93583f6dfb52838e6 [diff] |
am 1ccf8779: (-s ours) am dde10165: (-s ours) am 86799f35: (-s ours) Import translations. DO NOT MERGE * commit '1ccf87793b7b3a82f0fcfff93583f6dfb52838e6': Import translations. DO NOT MERGE