tree 53fcf4ecfc0416fb97d07ee3c17dee3109d20706
parent 85f01e682eff7b400ed6996f7482b695249db559
parent a35f24bc96e1d2d03086ae248508ea5be746a88b
author Nathan Harold <nharold@google.com> 1531337536 -0700
committer android-build-merger <android-build-merger@google.com> 1531337536 -0700

[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3ea82 am: 22590b06e8  -s ours
am: a35f24bc96  -s ours

Change-Id: Iac671407a301c933ab1bda0dadafcaa1573cc7d0