| commit | f63b7f050157942bd6c1046853dc60e8f67a5a9c | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <[email protected]> | Wed Apr 14 11:16:31 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Apr 14 11:16:31 2021 +0000 |
| tree | 94ce4b852041c4166603b0369497a8b16a54d872 | |
| parent | 1233b55e1e4b6df25b128e5ecddc8ff24e4289d6 [diff] | |
| parent | ad986df778da17d9c168a42da255f1efd4665bd6 [diff] |
[automerger skipped] Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 am: ad986df778 -s ours am skip reason: skip tag Change-Id Idef6f2fd89116490c43427bba55202f46377a83d with SHA-1 9c74c744fc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391 Change-Id: Ice6855b8b985465ff1657fed66f9029fcf57a48d