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

Commit 43f06698 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: c26dc73d am: ce012a56 am: 8c9aab39

Original change: https://android-review.googlesource.com/c/platform/build/+/1604977

Change-Id: Idbf67bcc636b31e931ef1a01eab40dbd92ea11dd
parents bb4fa129 8c9aab39

tools/zipalign/ZipEntry.cpp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ status_t ZipEntry::initFromCDE(FILE* fp) 
    }



    /*

     * Sanity-check the LFH.  Note that this will fail if the "kUsesDataDescr"

     * Check the LFH.  Note that this will fail if the "kUsesDataDescr"

     * flag is set, because the LFH is incomplete.  (Not a problem, since we

     * prefer the CDE values.)

     */