| commit | ea92e291a1a0a329de73360d3a1bcc84c34e7442 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 00:00:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 00:00:42 2014 +0000 |
| tree | 4aa127e08b8b00aba44e0eed72c527ec4d47fd8b | |
| parent | 971df150aa0f28d708ca0816862ecbd00b9bc55f [diff] | |
| parent | 1aa3abea279d8b3ead93d704d424757bfe65c2bd [diff] |
am 1aa3abea: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens * commit '1aa3abea279d8b3ead93d704d424757bfe65c2bd': Import translations. DO NOT MERGE