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:
29f2e1d
9c1cb7a
)
Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586
author
Paul Jensen
<pauljensen@google.com>
Mon, 19 Sep 2016 11:25:21 +0000
(11:25 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Sep 2016 11:25:21 +0000
(11:25 +0000)
am:
9c1cb7a273
Change-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b
1
2
services/core/java/com/android/server/connectivity/PacManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/connectivity/PacManager.java
Simple merge