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:
4e6061c
1b967b2
)
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first...
author
Bryan Ferris
<bferris@google.com>
Tue, 25 Jun 2019 22:07:19 +0000
(15:07 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Jun 2019 22:07:19 +0000
(15:07 -0700)
am:
1b967b2e4d
-s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1
f5e5af7f3d
is in history
Change-Id: Ibbc4830bf416da23c3b254c27cfa0c55ece4d495
Trivial merge