Skip to content
Commit 8b75287e 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 am: 8ba74400 -s ours am: e3b8e909 -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: Icf2f88a6ad7968ca58698b4dedc65650bf7a0c64
parents a1781d6a e3b8e909
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