tree b0d62cf80d1ace8ba97b5a31c504fe6426041a1b
parent e90e79983033a4bd07f6b34cd443086e02d351d4
parent f9864551c5f904ef28e40c4314daf79ad6855ce6
author Sarah Chin <sarahchin@google.com> 1601078693 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601078693 +0000

[automerger skipped] Merge "Add ncid to CellLocation in CellIdentityNr" am: c02910f164 am: c4a8dba971 am: 99f82fcc31 am: f9864551c5 -s ours

am skip reason: Change-Id Ib894e83900b590c11221502ad039781cea5b571c with SHA-1 69e53926f2 is in history

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

Change-Id: Ia10669002e5f0ed1353cd9bc9e22fbd8b5d8fd83