tree 499e089d193efa50f8b4c11d7cdd723c26c680a8
parent de6e39dc22d8f05df602f2733ae02788441b2a89
parent 5ab2e1a019c5a901b16340dd131aba957d616e04
author Nicholas Sauer <nicksauer@google.com> 1556879187 -0700
committer android-build-merger <android-build-merger@google.com> 1556879187 -0700

[automerger skipped] DO NOT MERGE Explicitly depend on privapp config.
am: 5ab2e1a019 -s ours
am skip reason: SHA1 5ab2e1a019 skipped by user nicksauer

Change-Id: I1854e8403e741da0322858d8d8fbbc6e136feb83