tree f0ac178fb62cffa8dae81fdbdc02b7087e9fccfb
parent f3bde710264544afcd3a91f74ecd283ca68c4e29
parent 774da343c68821b6790a3fb033807990a9bea0c2
author Anton Hansson <hansson@google.com> 1618397500 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618397500 +0000

Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: Ib95e1f34d7fa382d05c6e191ddb021b5bf5dad3c