| commit | 477e5c941571f1b3ec179438c06650fb9169aa2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 16:21:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 16:21:23 2014 +0000 |
| tree | dd041bee1805e79852b27e0c4f0fb47a45f52483 | |
| parent | 81080f7892b4101dbbea709bcbbcc96d0e52853b [diff] | |
| parent | 43418be69dd793bd57d703c4bfee079c92c6d3f4 [diff] |
am 43418be6: (-s ours) am 4212bfbc: (-s ours) Import translations. DO NOT MERGE * commit '43418be69dd793bd57d703c4bfee079c92c6d3f4': Import translations. DO NOT MERGE