tree 31ba4376aa97fdbe4d058b86b5855b097e3bcf14
parent 0c6becec119d29f6261dc8ed9c3402675c7eb69f
parent f37194e1baf2f25bf7af7fe4aa22b775de34f28e
author Pengquan Meng <mpq@google.com> 1548328399 -0800
committer android-build-merger <android-build-merger@google.com> 1548328399 -0800

[automerger skipped] Merge "Add RIL_RADIO_TECHNOLOGY_NR to IntDef" am: 54d74bbf06 am: 28b34fac22
am: f37194e1ba -s ours
am skip reason: change_id I4bec8de081efe1020409351afa284fd2e69a25b5 with SHA1 af741e2424 is in history

Change-Id: Ib26d4b06663583acbf20683dac38ecf0c48e7933