tree ea82d42a22451414eeea7ca87e48c477bce77e9b
parent 8cfae805e056320128cc7e506c8eae24daccac0b
parent 2545b2cabcb596ac65bbc4404f9afb2deec11288
author Treehugger Robot <treehugger-gerrit@google.com> 1588118086 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588118086 +0000

Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b9c7 am: 95d5f57b36 am: 5ae69e87ab am: 2545b2cabc

Change-Id: I339f8d9b0fcd6990c0f96d5d982b42005eb54923