Skip to content
Commit a06222a3 authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

[automerger skipped] Truncate ShortcutInfo Id am: 6a278c39 -s ours am: 947889f9 -s ours 

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5 is already in history

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



Change-Id: I19d0de5c5b85e6c137896333f700804b7adfbb8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6a74ea7 947889f9
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