| commit | 51914e7e250ed9406d936ad1746d44507686a1e1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 25 15:57:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 15:57:12 2015 +0000 |
| tree | ed2a7ae9c564d6f2c24b509e937605777759530c | |
| parent | a5ccc25fb797d45f39485319b463b1518ab5a115 [diff] | |
| parent | b0d49833be8a00a8466aeea6a839869371a90425 [diff] |
am b0d49833: (-s ours) am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'b0d49833be8a00a8466aeea6a839869371a90425': Import translations. DO NOT MERGE