| commit | 49939ee19ca7c34f9e54c6d8ab37b46521d2118a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 21:36:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 21:36:16 2015 +0000 |
| tree | 269f64d0c197986105e6a2a92aa7455426b49b81 | |
| parent | 780df1306cae7f1ffacaa7701bb97ea9077e0ad7 [diff] | |
| parent | 9fdbe43b1eb0dc684c2179be35bf145a540a58d3 [diff] |
am 9fdbe43b: (-s ours) am 36f80863: (-s ours) Import translations. DO NOT MERGE * commit '9fdbe43b1eb0dc684c2179be35bf145a540a58d3': Import translations. DO NOT MERGE