diff options
| author | Roman Kiryanov <rkir@google.com> | 2023-12-07 17:50:52 -0800 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2023-12-07 17:53:44 -0800 |
| commit | be464836362219969cfd9ec95273aef85657dd2b (patch) | |
| tree | 645d9a9612cc9b466bafdfaf9b9d8e172b6be32e | |
| parent | 7274404cf5acbab36fbb9dcfdf12abd101e27796 (diff) | |
| download | goldfish-be464836362219969cfd9ec95273aef85657dd2b.tar.gz | |
Delete empty files
bad merge conflict
Bug: 295259752
Test: presubmit
Ignore-AOSP-First: a mistake in a merge conflict from AOSP
Change-Id: I9a51fa370d77f8ca6c640e51ac5ff14e434b58ee
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | camera/media/media_codecs_google_video_default.xml | 0 | ||||
| -rw-r--r-- | camera/media/media_codecs_performance_c2.xml | 0 | ||||
| -rw-r--r-- | manifest.radio.xml | 0 | ||||
| -rw-r--r-- | vendor_common.mk | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/camera/media/media_codecs_google_video_default.xml b/camera/media/media_codecs_google_video_default.xml deleted file mode 100644 index e69de29b..00000000 --- a/camera/media/media_codecs_google_video_default.xml +++ /dev/null diff --git a/camera/media/media_codecs_performance_c2.xml b/camera/media/media_codecs_performance_c2.xml deleted file mode 100644 index e69de29b..00000000 --- a/camera/media/media_codecs_performance_c2.xml +++ /dev/null diff --git a/manifest.radio.xml b/manifest.radio.xml deleted file mode 100644 index e69de29b..00000000 --- a/manifest.radio.xml +++ /dev/null diff --git a/vendor_common.mk b/vendor_common.mk deleted file mode 100644 index e69de29b..00000000 --- a/vendor_common.mk +++ /dev/null |