tree c11e17d8664e5a7ccc0862f3a191c58fc20e71db
parent d6114db148b1ededd120de0cf2d1fc73ba1611ac
parent dabd9d99c63ce5cbca4c8a0487034bab4f173ee6
author Treehugger Robot <treehugger-gerrit@google.com> 1588623747 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588623747 +0000

Merge "Add METADATA to scrypt: Apache2+BSD=NOTICE" am: c284f76b4f am: 4436f99cac am: ce68324d6a am: 0d726f2747 am: dabd9d99c6

Change-Id: I561f6b209de297bb29bc2ef2796e9d0e952389e7