| commit | ba5740fd914de5e14fbe7f32ca149d87e19ebeda | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 14:34:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 14:34:28 2015 +0000 |
| tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df | |
| parent | 618e065cc14b9069954e462fc25cdc934ee3300f [diff] | |
| parent | 6468a29765cefff2ae094896dd2ce4092b5d2049 [diff] |
am 6468a297: (-s ours) am 326afbf4: (-s ours) am 2393f7e2: (-s ours) Import translations. DO NOT MERGE * commit '6468a29765cefff2ae094896dd2ce4092b5d2049': Import translations. DO NOT MERGE