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:
de9c540
27c2b72
)
Merge "Annotate locks" into oc-dev am: 373ab72112
author
Julia Reynolds
<juliacr@google.com>
Mon, 5 Jun 2017 17:38:58 +0000
(17:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 5 Jun 2017 17:38:58 +0000
(17:38 +0000)
am:
27c2b724ae
Change-Id: I180d360fbb2cde9f15e838f3880d2cd0f9eba4ca
Trivial merge