am 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning...
am 8164d4c3: am 46ed04de: Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev
* commit '8164d4c3':
Add javadoc comments mentioning ConnectivityManager API permissions.