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:
9737544
152b882
)
[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation...
author
Nan Zhang
<nanzhang@google.com>
Fri, 13 Apr 2018 19:21:34 +0000
(12:21 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 Apr 2018 19:21:34 +0000
(12:21 -0700)
am:
152b882488
-s ours
Change-Id: I27693328ab0a2817a069952fb0db72473d3db1ec
Trivial merge