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:
adf1d69
7ad3eb8
)
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev am: 7835c650b2
author
Andrew Solovay
<asolovay@google.com>
Thu, 21 Dec 2017 17:56:48 +0000
(17:56 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 21 Dec 2017 17:56:48 +0000
(17:56 +0000)
am:
7ad3eb8db0
-s ours
Change-Id: Ib0b4de07702d6a7337e47f72fe1b5d31039a5454
Trivial merge