Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ca34e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark libstagefright/flac as being a mainline directory." into sc-dev am: bc8397e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13829339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05fdc31a18ebf43a3b4312ddc7342b1999e26608
parents 3c7e8c4f bc8397e6
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
#
# mainline files for frameworks/av
# this list used by tools/mainline_hook_*.sh to help separate
# mainline changes vs framework changes, which release at different paces.
#
#
# ignore comment (#) lines and blank lines
# rest are path prefixes starting at root of the project
@@ -24,4 +27,5 @@
media/codec2/components/
media/codecs/
media/extractors/
media/libstagefright/mpeg2ts
media/libstagefright/mpeg2ts/
media/libstagefright/flac/