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:
8f0dce6
7e4e923
)
Merge "Lock all the things" into oc-dev
author
Julia Reynolds
<juliacr@google.com>
Tue, 18 Apr 2017 19:21:51 +0000
(19:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 18 Apr 2017 19:21:51 +0000
(19:21 +0000)
am:
7e4e923a8c
Change-Id: Iee7b299db15a6d6ada863b2fddbad9dfed3b700d
Trivial merge