| commit | 33e8e135fdba35d4c610334bc2f4de8952ba82fa | [log] [tgz] |
|---|---|---|
| author | Samiul Islam <samiul@google.com> | Thu Mar 24 15:58:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 24 15:58:17 2022 +0000 |
| tree | 40aaefbf7683fdcbf4a83bf33c81ec85045cca98 | |
| parent | 6b777e7a511571d87fc9abbbcf1e3509ae7c1110 [diff] | |
| parent | c9595a714051db4bfab08324cf7a1d4e5d601d40 [diff] |
[automerger skipped] Merge "Make ReconcileSdkData more flexible" am: 71f87cbb83 am: e4e804fedd am: 16f62b2cb2 -s ours am: 98c36935fa -s ours am: c9595a7140 -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: I0a7f300585cf30cc95717ea0bac6a2ae5a561efe