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:
0291a0a
707c4ae
)
resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
author
Tao Bao
<tbao@google.com>
Fri, 24 Jun 2016 05:42:12 +0000
(
05:42
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 24 Jun 2016 05:42:12 +0000
(
05:42
+0000)
am:
707c4ae757
Change-Id: I5bce55dbaab58b7c650a0ad743a7ba90ac6160b2
Trivial merge