tree fab07db92191e10677e3b225ebe15a51fb429ce2
parent b9d7bba5c5453f894608971fed44aed023dcd6ba
parent 2cb16d2e71398fcb73e3c7ecba093a4bae4490cb
author Paul Jensen <pauljensen@google.com> 1436542418 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436542418 +0000

am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

* commit '2cb16d2e71398fcb73e3c7ecba093a4bae4490cb':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks