| commit | a2a35add1feb10802b2ac93f48e8a3245c41ab92 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 23:54:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:54:52 2014 +0000 |
| tree | f9eb3a48c6339f9cd744cd98fa184bb54a9244d6 | |
| parent | 0df85f81dcd49f3ad59985cbc0bed86e14640639 [diff] | |
| parent | 3e2f975daecf2c25fa0c88d8e4b783ac6dd30231 [diff] |
am 3e2f975d: (-s ours) am 8ba957f1: (-s ours) am 13db1832: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3e2f975daecf2c25fa0c88d8e4b783ac6dd30231': Import translations. DO NOT MERGE