| commit | 2e4629a7296b1e49284dcf48fbb2b08e3854d23f | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Mon Oct 11 16:43:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 16:43:12 2021 +0000 |
| tree | b2c1009559879ea7af15f064beea7776eb017f29 | |
| parent | 169b1b9f79010c061e6bf1e28488335a43317a85 [diff] | |
| parent | 590544a1088c240238ece48f457b326066e682cc [diff] |
Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850198 Change-Id: I9eccbf4c8c2b67d2c0c1c5764d853e0e17f538eb