| commit | 9e4aa53f9ba3c2e0ea7b6823bed3ffea59d298f4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 27 05:37:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 05:37:06 2014 +0000 |
| tree | d43759c4e960e417837042f3004a16c4851be02b | |
| parent | bf640dbff257ac46ce6030ca1f4a559198762263 [diff] | |
| parent | 89fbe65e91d8538d0d39059c202f332fdf59a48e [diff] |
am 89fbe65e: (-s ours) am 4ebb0071: (-s ours) Import translations. DO NOT MERGE * commit '89fbe65e91d8538d0d39059c202f332fdf59a48e':