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:
b2c9f61
66785ee
)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent...
author
Jonathan Scott
<scottjonathan@google.com>
Wed, 22 May 2019 00:28:01 +0000
(17:28 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 May 2019 00:28:01 +0000
(17:28 -0700)
am:
66785eeba5
-s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1
cd6c636800
is in history
Change-Id: Ieb5f34b6aba4d9369be013a399652eac2f8210e0
Trivial merge