tree e1a756b40bf939f81b60b446a26daa65c85d0369
parent 079dd83c46d9a783784d590bfb856f4c409da784
parent b7af1503a18dacdb6e821a49de8a81d3a5cc9f57
author Android Build Merger (Role) <android-build-merger@google.com> 1495510965 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495510969 +0000

Merge "Merge "ConnectivityManager: improve argument validation" am: cdfd3a186f am: 0187514f74 am: b800e8520e" into oc-dev-plus-aosp