tree 89de3240c5820087c628d4dcd98fe0581b9f100c
parent 4e03b575b1287a218fc4a72215d27581bc9342fa
parent f610a18786befd476d196a8e7d9a01fbbfda94fc
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1548305830 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548305830 +0000

Merge "[automerger skipped] Merge "Fix doc of NETWORK_TYPE_NR & add converter" am: 1abe6aa53f am: a4e9cec4b3 am: 8a5c3bc6c2 -s ours am skip reason: change_id Ib9ee0dbe0234ef1bf9ef22900b00ddd47195914f with SHA1 3955593f7e is in history"