[automerger skipped] Merge "Add constants for NR_NSA, NR_NSA_MMWAVE" am: 109876b90c am: 2be994b854 -s ours

am skip reason: Change-Id I0faed300c3a2640ef6675ed7497575fe4f364b2c with SHA-1 152161ad00 is in history

Change-Id: I0b7ddb74e60d22910d2643a754b00fce05a566f1
This commit is contained in:
Sarah Chin
2020-03-31 21:12:14 +00:00
committed by Automerger Merge Worker

Diff Content Not Available