commit | c4304d07e5cdcbfd024162842aa7f85f928b2772 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 13 06:26:27 2022 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 13 06:26:27 2022 +0000 |
tree | 16a0e634c7dfc67ab8d0ea9351da1b48da493ae2 | |
parent | d09ae837551c4345e416040822c21df5947791d1 [diff] | |
parent | 301a6e469075f38b70c2a874fe16f9090e643481 [diff] |
Merge changes from topic "am-424aeccbae9040a69c4b15daaf596295" into tm-d1-dev-plus-aosp * changes: [automerger skipped] Merge "Add jarjar rule for android.support.v4" into tm-dev am: 3e5bd5cad1 -s ours am: f5ab4402b3 -s ours [automerger skipped] Add jarjar rule for android.support.v4 am: e3bb3a8960 -s ours am: eece291d0f -s ours