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:
b358ee3
c1b2e6d
)
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
author
Sudheer Shanka
<sudheersai@google.com>
Mon, 19 Sep 2016 21:50:49 +0000
(21:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Sep 2016 21:50:49 +0000
(21:50 +0000)
am:
c1b2e6db98
-s ours
Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3
Trivial merge