tree 0e3f21e924078f37d96a0ffe09a4e063030ed9bf
parent dc6c7db513ff3b895df761a82308882f1ff2e44e
parent 23984e2950129e67e6aee58802d193b94942dcb3
author Nathan Harold <nharold@google.com> 1553212414 -0700
committer android-build-merger <android-build-merger@google.com> 1553212414 -0700

[automerger skipped] Merge "Expose CellInfoTdscdma" am: 0b88e07ea5 am: 2c3dba9194
am: 23984e2950 -s ours
am skip reason: change_id Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e with SHA1 2175839ead is in history

Change-Id: I023570a0df49d979365f3307698285da2d872f83