summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24441553 Bug: 24445122 Change-Id: Ib7f025769adbafd5a2cb64fae5562a0a565945c2
| | * | | | | | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am ↵Wei Jia2015-10-061-0/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '3674abc050997e664c3906b8507d9d4b63d52e9d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | * | | | | | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ↵Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure buffer size is not less than 8 for LastCommentData." into klp-dev * commit '62d89908f6c7e3da9dac36aa439ceb1c2522b86d': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | * | | | | | | | am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer ↵Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size is not less than 8 for LastCommentData." into klp-dev * commit 'df68d9d5bf5329bc2f7effb6afa1d3904eaf30d8': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | * | | | | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not ↵Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less than 8 for LastCommentData." into klp-dev * commit '60b25aa0c173854593743dd85588c7449baf87c0': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | | * | | | | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 ↵Wei Jia2015-10-061-0/+6
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for LastCommentData." into klp-dev * commit '9ab9c85e39f089f355faa9cd9db6d113dc482e61': MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.
| | | | | | | * | | | | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for ↵Wei Jia2015-10-061-0/+6
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LastCommentData." into klp-dev
| | | | | | | | * | | | | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24346430 Change-Id: I897a724e968841d9160f819d06c0ce22f6d743c4 (cherry picked from commit 5cae16bdce77b0a3ba590b55637f7d55a2f35402)
* | | | | | | | | | | | am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am ↵Marco Nelissen2015-10-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '711e9dfc85dfa41c8c840103bd510e98d9b663da': Don't crash when there's no conceal frame
| * | | | | | | | | | | am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am ↵Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame * commit '8b3aa04a625dfd3adf68118e64da1eafec9db594': Don't crash when there's no conceal frame
| | * | | | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am ↵Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 257b3bc5: Don\'t crash when there\'s no conceal frame * commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe': Don't crash when there's no conceal frame
| | | * | | | | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when ↵Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there\'s no conceal frame * commit '7ce825833ad65cebfded3f35457925ae9e00124a': Don't crash when there's no conceal frame
| | | | * | | | | | | | am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ↵Marco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame * commit '13b6b51e6d9c399f0bfa55be4eecaf47b63845f2': Don't crash when there's no conceal frame
| | | | | * | | | | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4': Don't crash when there's no conceal frame
| | | | | | * | | | | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '257b3bc581bbc65318a4cc2d3c22a07a4429dc1d': Don't crash when there's no conceal frame
| | | | | | | * | | | | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24630158 Change-Id: If042aebebb58c218eb7bbf01dcddbcbd05dca1d6
| | | | | | * | | | | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3737a3fa121796131ea5b782230e65dad9ccf90f': DO NOT MERGE stagefright: fix AMessage::FromParcel
| | | | | | | * | | | DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
| | | | | | * | | | | am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6272fa1baf361a6a89607243638cc592047947b3': DO NOT MERGE Fix vulnerability in mediaserver
| | | | | | | * | | | Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | | |\ \ \ \
| | | | | | | | * | | | DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICrypto.cpp: ASLR bypass using DECRYPT IPC bug: 24074485 Change-Id: I40dd0e92083c7093030393b16dbab59323306a4e
| | | | | | * | | | | | am f43125ed: Merge "Fix for security vulnerability in media server DO NOT ↵Jeff Tinker2015-09-171-1/+23
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit 'f43125ed08a408b02613b99f058564d97ce690cc': Fix for security vulnerability in media server DO NOT MERGE
| | | | | | | * | | | | Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-devJeff Tinker2015-09-171-1/+23
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Fix for security vulnerability in media server DO NOT MERGEJeff Tinker2015-09-141-1/+23
| | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 23540426 Change-Id: I5d602f99fd82e50d0136d47ce20cfa1ac9fd7ae2
| | | | | | * | | | | | am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize ↵Wei Jia2015-09-171-10/+10
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables to ensure no info leak when writing them to Parcel." into klp-dev * commit 'ae92251730865e0c4bc59ef2a8fe9dacb6de41b9': DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
| | | | | | | * | | | | DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info ↵Wei Jia2015-09-161-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leak when writing them to Parcel. Bug: 23953967 Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b (cherry picked from commit 983dca391a76fb45df999fc40e8766b9ddb63511)
| | | | | | * | | | | | am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous ↵Wonsik Kim2015-09-164-7/+21
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | early free" into klp-dev * commit 'b21a642067477c72f419956da0ca8dafe0c04eab': DO NOT MERGE NuCachedSource2: fix possible erroneous early free
| | | | | | | * | | | | Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into ↵Wonsik Kim2015-09-164-7/+21
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | | | | * | | | | DO NOT MERGE NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-144-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the constructor of NuCachedSource2 sent a message to AHandlerReflector object, AHandlerReflector::onMessageReceived could have executed just before the object gets wrapped in a strong pointer, resulting in erroneous early free. Fix the issue by using static Create function to ensure the message is sent after the object is wrapped in a sp. Bug: 23882800 Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
| | | | | | * | | | | | | am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before ↵Wei Jia2015-09-111-2/+4
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading it from parcel." into klp-dev * commit '741a335126a562ae8f5883cc0b02ba72f40e56f3': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| | | | | | | * | | | | | Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from ↵Wei Jia2015-09-111-2/+4
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel." into klp-dev
| | | | | | | | * | | | | | DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-101-2/+4
| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c (cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)
| | | | | | * | | | | | | am b659b4c7: Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b659b4c7e1405056d189b44bd96036b6500dd378': DO NOT MERGE fix build
| | | | | | | * | | | | | Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | DO NOT MERGE fix buildWonsik Kim2015-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23707088 Change-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca
| | | | | | * | | | | | | | am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding ↵Wonsik Kim2015-09-112-94/+21
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | once again" into klp-dev * commit '1784a8dbbc73b3e6033340d107b6c08478b962c8': DO NOT MERGE Avoid size_t overflow in base64 decoding once again
| | | | | | | * | | | | | | Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-112-94/+21
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | | | / / / / / | | | | | | | | |/ / / / / | | | | | | | |/| | | | | into klp-dev
| | | | | | | | * | | | | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-092-94/+21
| | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
| | * | | | | | | | | | am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix ↵Flanker2015-09-291-3/+25
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMessage::FromParcel * commit '992148484a286dab886dd4d1b58dabacf1c1920f': stagefright: fix AMessage::FromParcel
| | | * | | | | | | | | am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e64d4870a543803d8172b80ad8eb198dfde6f361': stagefright: fix AMessage::FromParcel
| | | | * | | | | | | | am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b8cd9cbb3e72ffd048ffdd1609fac74f61a22ac': stagefright: fix AMessage::FromParcel
| | | | | * | | | | | | stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for incoming mNumItems. Also add check readCString return value. Fix style & add log. Bug: 24123723 Change-Id: If41a5312c27d868f481893eef56019b6807c39b7
| | * | | | | | | | | | DO NOT MERGE - Fix build for commit 69ae6a87Andy Hung2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test app on lmp-mr1-ub-dev but not on lmp-mr1-dev now needs liblog. Change-Id: Ia995d9101e85f6a68c85d3156fd6b78fa96c87e0
| | * | | | | | | | | | am 9b9612fb: am 92504274: am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: ↵Wei Jia2015-09-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev * commit '9b9612fbea5b73779d128cef45b4c08446bf6341': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
| | | * | | | | | | | | am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: fix the missing ↵Wei Jia2015-09-211-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev * commit '7e1d645f6822dc015bd828c12db63359517cc362': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
| | | | * | | | | | | | am a8f90d57: Merge "IAudioFlinger: fix the missing initialization of ↵Wei Jia2015-09-171-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable to ensure no info leak when writing them to Parcel." into lmp-dev * commit 'a8f90d57f5b3ad4ef7194501aa20f0a0bd903e8f': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
| | | | | * | | | | | | Merge "IAudioFlinger: fix the missing initialization of variable to ensure ↵Wei Jia2015-09-171-1/+1
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no info leak when writing them to Parcel." into lmp-dev
| | | | | | * | | | | | | IAudioFlinger: fix the missing initialization of variable to ensure no info ↵Wei Jia2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leak when writing them to Parcel. Bug: 23953967 Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829 (cherry picked from commit 4cac44b53cc9f965cc2c9706b1d7ee2cd79f4066)
| | * | | | | | | | | | | am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix ↵Jeff Tinker2015-09-211-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vulnerability in mediaserver" into lmp-dev * commit '69c8327b741844072948831162e94a52a34152f1': DO NOT MERGE Fix vulnerability in mediaserver
generated by cgit v1.1 at 2024-06-01 17:49:37 +0000