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:
0d04871
94d5cdc
)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Careful with screenshots containing...
author
Bryan Ferris
<bferris@google.com>
Wed, 8 May 2019 23:35:21 +0000
(16:35 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 8 May 2019 23:35:21 +0000
(16:35 -0700)
am:
94d5cdca2a
-s ours
am skip reason: subject contains skip directive
Change-Id: I3f6fdf2b3de003538c5a93d7cc36a7bbffb6c57f
Trivial merge