tree b46405b702951355046875cb59ca1db48a181a46
parent e055bfa0facc672e1b2640cbbf70a1edf2a4698b
parent 1abe6aa53f0f21ff399166b561d79f7ccc48aa41
author Pengquan Meng <mpq@google.com> 1548304667 -0800
committer android-build-merger <android-build-merger@google.com> 1548304667 -0800

Merge "Fix doc of NETWORK_TYPE_NR & add converter"
am: 1abe6aa53f

Change-Id: I60d839b62e9b9365df48c72b040f1f5b2e7b011c