tree 1c16e7d6aa2da8d3beb607cc2b61cef387c8afe3
parent 7ceee368ee4fd043caea47e52217397f12312db5
parent c4a8dba9711c7a06f5a772912d42230fb3658728
author Sarah Chin <sarahchin@google.com> 1601075965 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601075965 +0000

Merge "Add ncid to CellLocation in CellIdentityNr" am: c02910f164 am: c4a8dba971

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

Change-Id: Ia6fd2c693905ecda65c88305c4f71d2d5fd567bd