tree 4d20c91915009748361119878a3559ccc304b116
parent 2aeb58ef4b10088726e89e39d173266960fa12b9
parent 369343739e95b0b07206d0e8db9f4b3e6dd17ce8
author Chen Xu <fionaxu@google.com> 1549342911 -0800
committer android-build-merger <android-build-merger@google.com> 1549342911 -0800

Merge "Change permission of getPreferredNetworkType" am: 59c34ab97f am: 81309a6781
am: 369343739e

Change-Id: Ie545be9a03278ddb75e404ebe92194d6f9312120