48ff28ba378a88906a604095b9aba659e5ea16c0
909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19350124
Change-Id: I5af3771bd42f3a128ee7524ad188a455c3bb4db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am:
950fb419e7
…
…
…
[automerge] DO NOT MERGE: Revert "Make CheckOp return allowed if any attr tag for a package is excluded" 2p:
de7b0f6dd0
…
…
…
…
…
…
…
…
…
…
…
…
…
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am:
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409
[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am:
0d2e7006ce
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%