| commit | 5a593ae7979d5f2b7fe19b677382a4a26c782055 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 08 17:06:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 17:06:14 2015 +0000 |
| tree | dd8749f59e61414263b8867cea68801ee7c45185 | |
| parent | 334e06741d54167c6c445f379f9317f914851594 [diff] | |
| parent | f58f6c6e430041400c50419ebefd4b676417b74d [diff] |
am f58f6c6e: (-s ours) am 06202b5c: (-s ours) Import translations. DO NOT MERGE * commit 'f58f6c6e430041400c50419ebefd4b676417b74d': Import translations. DO NOT MERGE