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:
5e66d5d
ad7c4f9
)
[automerger skipped] Merge "Fix PixelCopyTest failure in CTS" am: b773556215 -s...
author
John Reck
<jreck@google.com>
Thu, 21 Jun 2018 06:02:45 +0000
(23:02 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Jun 2018 06:02:45 +0000
(23:02 -0700)
am:
ad7c4f9c0f
-s ours
Change-Id: I42041afe19e43a5ab7f00376f5b9ab727e6571d0
Trivial merge