OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5e2946 ca36baa)
am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePor...
authorPaul Jensen <pauljensen@google.com>
Fri, 10 Jul 2015 15:46:28 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 15:46:28 +0000 (15:46 +0000)
* commit 'ca36baafef8024973ab8aebb54913a96db3d0e77':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help