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:
eacf98b
8d302da
)
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358e...
author
Sudheer Shanka
<sudheersai@google.com>
Tue, 20 Sep 2016 06:33:24 +0000
(06:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Sep 2016 06:33:24 +0000
(06:33 +0000)
am:
8d302da986
-s ours
Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643
Trivial merge