| commit | cedf8bade74bdb2cb7f0e6bcd05a5becfb28251f | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Mon Oct 11 17:03:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 11 17:03:50 2021 +0000 |
| tree | 40b7341eece8148d023eb2a41c59ca50bd3c1d82 | |
| parent | 3867fd437bae3e60bc2ce19ae7ab2676b2326a66 [diff] | |
| parent | 7fafe71ffce83318237f806c540b2cf9c8167842 [diff] |
Merge "Rename merged services.txt module" am: 74b15ca3c5 am: 58ae8524f5 am: 590544a108 am: 2e4629a729 am: 7fafe71ffc Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850198 Change-Id: Id0eba8d4c25a84c39e767d4738534880d422523e