Skip to content
Commit e2e795ab authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add implementation for IRK to parcelable... 

[automerger skipped] Merge "Add implementation for IRK to parcelable functions." into sc-dev am: e0276d9c -s ours am: 4833f3ae -s ours

am skip reason: Merged-In I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9 with SHA-1 60b797bd is already in history

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

Change-Id: Idf0248f4086231571476ec05205836b5af93d54d
parents 41477f80 4833f3ae
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