OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
07569ab
169f7be
)
Merge "Instrument captive portal login activity" into oc-dr1-dev
author
Hugo Benichi
<hugobenichi@google.com>
Fri, 9 Jun 2017 23:23:17 +0000
(23:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 9 Jun 2017 23:23:17 +0000
(23:23 +0000)
am:
169f7bebce
Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f
1
2
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
Simple merge