tree da581028905318f358769fc7bb6f8aa7373e2fb7
parent 43e4f53668c5840da1f51260a899cdb19394284b
parent 7d0daf1b3b3163c34e0108cdb439e2cd2f148152
author Bob Badour <bbadour@google.com> 1589845936 -0700
committer Bob Badour <bbadour@google.com> 1589848174 -0700

Merge remote-tracking branch 'aosp/upstream-master' into mymerge

The version of shflags we have now includes a file with an erroneous
LGPL license header even after the author relicensed under Apache2.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: manual build
Test: treehugger

Change-Id: Ifc31394445d94248473d60b011fa76f66985e0b4