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

[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am:... 

[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b2 -s ours am: 71e2d68e -s ours

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

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



Change-Id: I3940ad94e3a1e0f17e924f7c6de9421e0b09c7e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7719f36a 71e2d68e
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