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:
7290817
44975ee
)
[automerger skipped]Merge "Mark eraseSubscriptions as @SystemApi." am: a99b258049
author
Holly Jiuyu Sun
<jiuyu@google.com>
Thu, 22 Mar 2018 06:06:01 +0000
(06:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Mar 2018 06:06:01 +0000
(06:06 +0000)
am:
44975ee51f
-s ours
Change-Id: Iab4f2a3cbe355daa52b800a1775c25438b10ade5
Trivial merge