summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-29 19:57:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-08-29 19:57:19 +0000
commitc861151f1af7ed6ffa3ca653d216d70e040822fb (patch)
treeb4295bd8a1ceb2c2cd8560333649cdc78a294cce /cmds/bootanimation/BootAnimation.cpp
parent03ccb8a31359ba5b06b9718b59e7b6903cdbe433 (diff)
parentbfa4c0ca33bf8d2e348053cbfdb49671dd7bfcbc (diff)
Merge changes from topic "am-9e57427fe8294c8cb5fe5519156d3843" into tm-qpr-dev-plus-aosp
* changes: Merge changes from topic "scdevbug" into sc-qpr1-dev am: 367d37a935 am: f4241e629b am: 29eeb2f9b2 am: 9ae7f4b692 am: edf460ba25 [automerger skipped] [automerge] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb8e am: 75ed22a797 -s ours am: f02d6d9320 -s ours am: 1d184708e2 -s ours am: 0754cfe4d1 -s ours am: 074c669f40 -s ours
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions