| commit | 3e075db78e3a8b02c87b899bb492121b66a07d9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:22:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:22:59 2015 +0000 |
| tree | 4166f35e207a2990be6928d39dcc40a24f208838 | |
| parent | 63e7219216d8e7724c86fcb8b582f482dafe6cdb [diff] | |
| parent | 01c2e28b66865c2b3264a1b5caf9a2dfc3b795bc [diff] |
am 01c2e28b: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '01c2e28b66865c2b3264a1b5caf9a2dfc3b795bc': Import translations. DO NOT MERGE