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:
4a207e3
a319aa8
)
Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from...
author
Dianne Hackborn
<hackbod@google.com>
Fri, 9 Jan 2015 19:13:58 +0000
(19:13 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 9 Jan 2015 19:13:58 +0000
(19:13 +0000)
automerge:
a319aa8
* commit '
a319aa800df36d40e1de453b64fd1e14573e6d80
':
Fix issue #
18942959
: Phone getting stuck then restarts after unplugging from Audi
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge