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:
784a663
b73e902
)
resolve merge conflicts of 012144f to nyc-dev am: bb9a8d8eb8
author
Jeff Vander Stoep
<jeffv@google.com>
Fri, 24 Jun 2016 03:44:03 +0000
(
03:44
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 24 Jun 2016 03:44:03 +0000
(
03:44
+0000)
am:
b73e902c7d
Change-Id: Ib84efcf8d64e833f93b93b0ce3ddd1f6374949cf
Trivial merge