Fix copyright header

Change-Id: I70a0732f67617a96b6dd20eccbc6c02a9dafdabd
search_screen
Takeshi Hagikura 2 years ago
parent 86fe3b2152
commit 5e28769831

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
<<<<<<< HEAD
Copyright 2023 The Android Open Source Project Copyright 2023 The Android Open Source Project
=======
Copyright 2022 The Android Open Source Project
>>>>>>> b23ba8b2 (Add UI skeleton for the search feature)
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

Loading…
Cancel
Save