tree 3dab12c0b9ffb899e5d0d08f033df7d8f24eaecc
parent 332b5b57861bc6d40daa6470162877104a262a2b
parent a4e9cec4b3ad257d60f53dd8318f75306d3d1146
author Pengquan Meng <mpq@google.com> 1548305227 -0800
committer android-build-merger <android-build-merger@google.com> 1548305227 -0800

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

Change-Id: Ic2bea19fad4095c4f16b34691bbb6ff39546cb19