| commit | 98c36935fa9c6d8607473ca5edc937dc261c2b7f | [log] [tgz] |
|---|---|---|
| author | Samiul Islam <samiul@google.com> | Thu Mar 24 15:31:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 24 15:31:12 2022 +0000 |
| tree | 30cb0f377678e61a5f8fb438ae4b463c24ef6ac1 | |
| parent | 88ada2482f14a64c7890a4e1782699f1f0d5ca3d [diff] | |
| parent | 16f62b2cb232a5b81462641c211c350324564fcc [diff] |
[automerger skipped] Merge "Make ReconcileSdkData more flexible" am: 71f87cbb83 am: e4e804fedd am: 16f62b2cb2 -s ours am skip reason: Merged-In Ie9cdc2c41bcec64028008a79654f2d38c017b6d1 with SHA-1 5288b055c1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2031828 Change-Id: I1c52a000bf0a9103db18351bb35e62d6cd5e4a50