Skip to content
Commit c3822079 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Store pending override config instead of creating... 

[automerger skipped] Merge "Store pending override config instead of creating ActivityClientRecord" am: 1a0d8de3 am: 047f71a1 -s ours

am skip reason: Merged-In If350e942254e54c9ec90bc63a6e50eb67d038183 with SHA-1 6b104eec is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128414



Change-Id: I15ebff7f4f5f7481869c6cd84f94941ead5155e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab900e7f 047f71a1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment