diff options
| author | 2023-08-29 21:47:30 +0000 | |
|---|---|---|
| committer | 2023-08-29 21:47:30 +0000 | |
| commit | d09fa16e0f3292b4810ae1fd6eaf4fc3a95f2cf5 (patch) | |
| tree | 16e6637e226f39a4da9fda9f697649a728a1b4b3 /native/android/configuration.cpp | |
| parent | 1fda020cf988dd3efc19f7ce458f1d5c843abf4b (diff) | |
| parent | f9d32fd76829e497c33123a117fe2ddcb5cb68e5 (diff) | |
[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-dev-plus-aosp am: 38e9c2e9d6 am: f32dc8d349 -s ours am: f9d32fd768 -s ours
am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 08e2fd0c4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24422866
Change-Id: I3c5a583c765147dcf3ad3b4acee63dc62b0df10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions