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:
635c42b
c040ffd
)
[automerger skipped]Merge "Add new trace tag for AIDL." am: fe3877f140
author
Martijn Coenen
<maco@google.com>
Mon, 26 Mar 2018 20:38:34 +0000
(20:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 26 Mar 2018 20:38:34 +0000
(20:38 +0000)
am:
c040ffd288
-s ours
Change-Id: I6e5fb41fc029498229f273e02d6c039b539cafbf
Trivial merge