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:
7567c26
bda9b32
)
am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10"...
author
Adam Lesinski
<adamlesinski@google.com>
Wed, 19 Aug 2015 01:39:03 +0000
(
01:39
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 19 Aug 2015 01:39:03 +0000
(
01:39
+0000)
* commit '
bda9b324c88b70514109f2d9ffc937ca3202fd03
':
Change default cellular activity timeout to 10
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge