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:
02d63ef
b79e317
)
resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp
author
Baligh Uddin
<baligh@google.com>
Fri, 24 Jun 2016 02:54:37 +0000
(
02:54
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 24 Jun 2016 02:54:37 +0000
(
02:54
+0000)
am:
b79e31756b
Change-Id: Iae9c2dca0127326a4aa04a1bc7703f59ea217aa6
Trivial merge