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:
6531ea2
ca0c91b
)
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master
author
Hugo Benichi
<hugobenichi@google.com>
Tue, 20 Jun 2017 07:18:25 +0000
(07:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Jun 2017 07:18:25 +0000
(07:18 +0000)
am:
ca0c91b9f1
Change-Id: I941327a914d4a44e63a5f57fc0aa98d778fef949
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
OSDN Git Service
