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:
e82c4b8
fc28b6b
)
[automerger skipped] Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad...
author
Mihai Popa
<popam@google.com>
Wed, 15 Aug 2018 20:04:26 +0000
(13:04 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 15 Aug 2018 20:04:26 +0000
(13:04 -0700)
am:
fc28b6b724
-s ours
Change-Id: I74179d805d746ccbb32546fb268cb52c8c9db514
Trivial merge