[automerger skipped] Merge "Add 5G rat type" am: 8f9f382c9c am: 411ea19296

am: 41c1d31677  -s ours

Change-Id: I6a3a9d184eeba5da50400ad79c6c24eb1d5e88d0
This commit is contained in:
Pengquan Meng
2018-12-10 14:52:05 -08:00
committed by android-build-merger

Diff Content Not Available