| commit | 4a74e0761d6567ed3af5da86903e80d2dbf9cb78 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 03:46:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 03:46:10 2015 +0000 |
| tree | 6abfeb9284680eb2d923c55cbfa9bb6126c9703a | |
| parent | 104c3d3d641f87bd18c35cd2e0d584a515b9fb32 [diff] | |
| parent | 03fe71ed0067a1c6937569ade4c583a914034173 [diff] |
am 03fe71ed: (-s ours) am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE * commit '03fe71ed0067a1c6937569ade4c583a914034173': Import translations. DO NOT MERGE