OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55d21d8
a420948
)
Merge "aaudio: command line argument parser" into oc-dr1-dev am: 0acb320910
author
Phil Burk
<philburk@google.com>
Wed, 12 Jul 2017 03:43:06 +0000
(
03:43
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 12 Jul 2017 03:43:06 +0000
(
03:43
+0000)
am:
a420948421
-s ours
Change-Id: Id9e51947b7619d700b4709be931eaf0240b01971
Trivial merge