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:
1d4a76c
b699685
)
resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
author
Elliott Hughes
<enh@google.com>
Mon, 10 Aug 2015 20:04:27 +0000
(13:04 -0700)
committer
Elliott Hughes
<enh@google.com>
Mon, 10 Aug 2015 20:04:27 +0000
(13:04 -0700)
Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a
Trivial merge