commit | bd193df7d99a69772d1c75cafbce82714dfe019e | [log] [tgz] |
---|---|---|
author | Harshit Mahajan <harshitmahajan@google.com> | Thu Jan 11 10:54:26 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 11 10:54:26 2024 +0000 |
tree | 183d8760f8bf7b28de6aff131ebc65f48789410b | |
parent | 016cbf408f1acd7b3ffdb3ecda68abcc394784b3 [diff] | |
parent | 97d9a8996c2c5cdae5e54a2ae1c2a8f1defa86b6 [diff] |
Merge "Add combined_api_defaults module type" into main am: 364446fa7a am: ceaff1ca1a am: 97d9a8996c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2882815 Change-Id: Idd5f35d403860811b4277b95f66373a929ee847d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>