tree 4f34d19ef9e6bb9381f15cc965cad010d36284ee
parent f6cce01894124a59a67b74b9aab7051a669b5999
parent b30c34142c113f6d9cbbe38f1e0c87fff40e562e
author Pengquan Meng <mpq@google.com> 1549944838 -0800
committer android-build-merger <android-build-merger@google.com> 1549944838 -0800

[automerger skipped] Merge "Add get/set PreferredNetworkTypeBitmap" am: 0beb397fa5 am: 865ce409d3
am: b30c34142c -s ours
am skip reason: change_id Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91 with SHA1 6d8e76f08a is in history

Change-Id: I622dd00eb0eed98de6001d9294e7c84ff0482363