tree cd31adf1deca87ab2388f3fb8c8ded02ee54eccb
parent e6074b3213babfb8a03a4787233bf35d89f42d1d
parent e4e804fedd793399fba5651d1bd43cf503f52860
author Samiul Islam <samiul@google.com> 1648134949 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648134949 +0000

Merge "Make ReconcileSdkData more flexible" am: 71f87cbb83 am: e4e804fedd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2031828

Change-Id: I84024fcb4f308682f7b9bad4465c7377376ec11c