OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
57b814d
9568bfb
)
resolve merge conflicts of 6471f22 to nyc-mr1-dev-plus-aosp
author
Badhri Jagan Sridharan
<badhri@google.com>
Fri, 15 Jul 2016 18:29:00 +0000
(18:29 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Jul 2016 18:29:00 +0000
(18:29 +0000)
am:
9568bfbd4c
Change-Id: Ie5b9bd12de4d17bf124745c79bc9893f1c03e110
Trivial merge