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:
fdb129f
c54b59a
)
Merge "resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65...
author
Android Build Merger (Role)
<android-build-merger@google.com>
Thu, 21 Sep 2017 02:59:27 +0000
(
02:59
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 21 Sep 2017 02:59:27 +0000
(
02:59
+0000)
Trivial merge