tree 8ac8b0bb4b20bc58ebb28b804569d8a74f368a6c
parent dc815221a71397929fe4fc618397866e2f3c6767
parent 3f0139b119cd926559f7893f63b1ba6d40cef2d3
author Treehugger Robot <treehugger-gerrit@google.com> 1649080864 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649080864 +0000

Merge "Non-module targets." am: 3f0139b119

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052132

Change-Id: I9d78eb2f88f9ed97a36d6757744b4406435d3853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>