Skip to content
Commit 061857e0 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: e2e795ab -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: I5a489f9f6c2da312bccd076fc69bb0c28a30c922
parents 1969b966 e2e795ab
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