summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-06-16 20:38:50 +0000
committer Beth Thibodeau <ethibodeau@google.com> 2023-06-16 20:57:01 +0000
commitf001eb5c6c75e26ff743c9f59b882e008b52923b (patch)
tree41302cbb6d3348fbcd1a5d46c2ee4f03673338cc /native/android/configuration.cpp
parent964e3b623076553194b069fbc34bb8d56a63d573 (diff)
parentf97d449d4747763008c636a114071f01f0ce3f3c (diff)
[conflict] [conflict] Merge "Add placeholder when media control title is blank" into rvc-dev am: 98e02fa86e am: f97d449d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23717227 Change-Id: I79635bb40b66edbe898afe856e2aa375da166e23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: Ie406c180af48653595e8e222a15b4dda27de2e0e Merged-In: I1cb6010f19623bd7d5e5bbb5d829b9e4936894b8
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions