OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf7e78b
303a851
)
resolve merge conflicts of 303a851 to nyc-mr2-dev-plus-aosp
author
Tao Bao
<tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000
(15:50 -0700)
committer
Tao Bao
<tbao@google.com>
Wed, 26 Oct 2016 22:50:11 +0000
(15:50 -0700)
Change-Id: I2c128766ccab4c21ef87b0b87c6b6a517e9280b2
Trivial merge