tree b2c51cfcb6fd84f7a785f584d8405dbdfa6939d7
parent 0e7aa90e3f90f8d1b14704feb0f2c67c880167f3
parent 83ef1633d92211ea78e275b4f3df78aea80fbaf6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1572904867 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1572904867 +0000

Merge "[automerger skipped] Merge "Pass bearerData and serviceCategory to CB module for CDMA" am: 234ede4445 am: 8cd40be2c9 am: b86e749dd2 -s ours am skip reason: change_id I98f79fbb384881de5cb65fa7fe7a08b3f5b2e272 with SHA1 6d64fc657f is in history"