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:
56eaecd
f06c6d0
)
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
author
Hall Liu
<hallliu@google.com>
Wed, 30 May 2018 22:28:18 +0000
(15:28 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 May 2018 22:28:18 +0000
(15:28 -0700)
am:
f06c6d0187
-s ours
Change-Id: Ic6ae00ffdf13aff3b3c081c2b00cefbfa1412d6f
Trivial merge