| commit | cf51139c6e1d57b57177109f2177edc41edf5bbc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:41:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:41:26 2015 +0000 |
| tree | f951c975eb2392551ddc0eecc2212fd7b65d1df0 | |
| parent | 05ffc7265bfca0810d03177d61f7c1bb6bd39ecb [diff] | |
| parent | 494d2237b8d7b892902604c18098127e77372509 [diff] |
am 494d2237: (-s ours) am a83129f0: (-s ours) am e5ec4ac4: (-s ours) Import translations. DO NOT MERGE * commit '494d2237b8d7b892902604c18098127e77372509': Import translations. DO NOT MERGE