summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Ian Baker <ibaker@google.com> 2023-10-31 14:15:53 +0000
committer Ian Baker <ibaker@google.com> 2023-10-31 14:15:53 +0000
commit54342761f0739a209d46938a0e956ab71c15d980 (patch)
tree00db9a9c981a8cfccbd77be3d6c3f79e19c244fc /libs/input/PointerController.cpp
parentf86d5a5c3a4067f59bbe47ee4967da6100fef534 (diff)
Cherry-pick MediaFrameworkTest dep changes from internal main
This resolves automerge conflicts in aosp/2745223 This is a manual cherry-pick of aosp/2796172 with different automerger tags (see comment: https://android-review.git.corp.google.com/c/platform/frameworks/base/+/2796172/comments/f84931d5_488e9082). Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest Bug: 298965955 Merged-In: I81d512e9b21b64a2cca0450cb85c52d8a2125865 Change-Id: I8cb92fd35b3633cf458f8692173124fd1666d6b5
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions