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:
bf2fbaa
9296dcf
)
Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c am: 057f582e09
author
Brad Ebinger
<breadley@google.com>
Mon, 25 Jun 2018 19:05:12 +0000
(12:05 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 25 Jun 2018 19:05:12 +0000
(12:05 -0700)
am:
9296dcff69
Change-Id: I22b387d5437ec62d8ba0d6ca869e86772fc44efb
Trivial merge