commit | 77c740d06f4c5de943aa87a6ceab605204877f91 | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Wed Mar 02 13:50:15 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 02 13:50:15 2022 +0000 |
tree | 64da082f47fc5803640d257327c7466075f7f668 | |
parent | 0ccc390b01205913d506577d8d5b515e14a3c344 [diff] | |
parent | 8ebf129e09b3ee50f5fc7dbd0b6f83b2130ba540 [diff] |
[automerger skipped] Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" am: 9a74429f56 am: 02ac2482a1 am: 8ebf129e09 -s ours am skip reason: Merged-In Ie1fe81006555dbcca4b62457fa6c319f04b4576d with SHA-1 2c266fbc3b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894970 Change-Id: I192c1e015b65fbf1b8c6c1b7ed0fe7380600663d