| commit | bc6a6bae4351310629b00a6f89fc9ee28a7c18aa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:15:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:15:18 2014 +0000 |
| tree | 1771eff699781c835138b19f7ec2492ca19d6a1d | |
| parent | 86f180fd2dc2431a2f40676fab1c67a1939d60ac [diff] | |
| parent | 40ac65447bc9c7cf4f1b88ddde921fabb2448fe6 [diff] |
am 40ac6544: (-s ours) am c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '40ac65447bc9c7cf4f1b88ddde921fabb2448fe6': Import translations. DO NOT MERGE