| commit | 90bda4746d6181dfc61f9033347932beb9ddd9cd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 27 18:51:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 18:51:32 2014 +0000 |
| tree | ac1420553126c7167abcc6673ec0d68499e881fa | |
| parent | 26aab820630b3b7c63a38984bc5d3da16d479bc8 [diff] | |
| parent | 68b7bd6020b3739528cef3c22a4f5b71958eab84 [diff] |
am 68b7bd60: (-s ours) am 6bc4577c: (-s ours) Import translations. DO NOT MERGE * commit '68b7bd6020b3739528cef3c22a4f5b71958eab84':