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:
2ab2eca
1d09efe
)
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27 am...
author
Hall Liu
<hallliu@google.com>
Wed, 30 May 2018 23:02:11 +0000
(16:02 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 30 May 2018 23:02:11 +0000
(16:02 -0700)
am:
1d09efefeb
-s ours
Change-Id: I3ce9e1d994c4f686d881a3a322ef8a5c40187334
Trivial merge