OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c41e319
c1244a2
)
resolved conflicts for merge of c1244a29 to mnc-dr-dev
author
Adrian Roos
<roosa@google.com>
Wed, 22 Jul 2015 19:00:50 +0000
(12:00 -0700)
committer
Adrian Roos
<roosa@google.com>
Wed, 22 Jul 2015 19:00:56 +0000
(12:00 -0700)
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
Trivial merge