summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Xinyi Zhou <zxy@google.com> 2022-01-31 14:50:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-31 14:50:36 +0000
commit280405084857d8bff93574dcf6a45412cda23a89 (patch)
treeebe87c94a284589f4ed25f99e5c836addcf910b1 /opengl/java
parent34209090dc3a1a51755411237907cd0679d6a7fe (diff)
parentb56bb8fa98f24b659862ed2a747d22821e8e2239 (diff)
[automerger skipped] Add NearbyService am: 17c5caf93e am: 56f293dba5 am: 54018f78e6 am: b56bb8fa98 -s ours
am skip reason: Merged-In I399cdba08846a3eca1d7cd9378607b30fa8fd72d with SHA-1 97e88eea69 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966440 Change-Id: I4abe7e9e7718a3c0f6e6793672f6f84471e94a19
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions