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:
5c53e1b
900550d
)
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
author
Sudheer Shanka
<sudheersai@google.com>
Mon, 19 Sep 2016 20:47:39 +0000
(20:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Sep 2016 20:47:39 +0000
(20:47 +0000)
am:
900550de49
Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1
Trivial merge