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:
ecfc6b4
a5d8c37
)
Merge "Resolve conflict between javadoc and CDD re: audio output" into pi-dev
author
Glenn Kasten
<gkasten@google.com>
Tue, 29 May 2018 19:21:18 +0000
(12:21 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 29 May 2018 19:21:18 +0000
(12:21 -0700)
am:
a5d8c3718d
Change-Id: I7cd068ce53874be19ed4a81e32b87731b0d13c35
Trivial merge