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:
e5f2ef1
c8d479f
)
[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8 am: d07eb64e0...
author
Hall Liu
<hallliu@google.com>
Thu, 12 Apr 2018 22:37:24 +0000
(15:37 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 Apr 2018 22:37:24 +0000
(15:37 -0700)
am:
c8d479f12e
-s ours
Change-Id: I3dea81b59a720fb21293c610ed40fbaf89145aea
Trivial merge