| commit | d3fb75eaae74cd94e25de82ff029168f59344500 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 13:14:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 13:14:37 2015 +0000 |
| tree | ca3308007c9a22807017045f487fbabebc11b45b | |
| parent | e990b822893cb465b48671ec3eb92959cc039f87 [diff] | |
| parent | de7f5755753567851556709e0eb8911a09b027f7 [diff] |
am de7f5755: (-s ours) am 351e41c0: (-s ours) am 40d451e4: (-s ours) Import translations. DO NOT MERGE am: 750de1a558 -s ours * commit 'de7f5755753567851556709e0eb8911a09b027f7': Import translations. DO NOT MERGE