| commit | 4bd4bdf3a7222872de73b08342dc6b9c00730fc3 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Thu Feb 24 11:31:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 24 11:31:53 2022 +0000 |
| tree | 889b371430bd25012f758acc841a3cd03d43028a | |
| parent | a72c59093b6621c407a80112164b80c00a4687d2 [diff] | |
| parent | c36460bc4c67174b554f301a4c603d965d875de5 [diff] |
Merge "Expand comment about using a merge api base" am: 0cf86f5a44 am: c36460bc4c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997110 Change-Id: Icb22a9f81c49df88b4a3170f31174112e1ca9d4c