| commit | 7f150f8676f2564df274380320bc5ea3c2e138de | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 27 18:35:12 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 27 18:35:12 2013 +0000 |
| tree | 7696c758619d8863c08cceb57bb25be52a90a74e | |
| parent | 1d3205f62a75b92cda1b10f3151234741e4e708b [diff] | |
| parent | 4f43824b04223d3958efa757014b4c29044aae55 [diff] |
am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE * commit '4f43824b04223d3958efa757014b4c29044aae55': Import translations. DO NOT MERGE