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:
c35a9fe
77dec89
)
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
author
Sudheer Shanka
<sudheersai@google.com>
Thu, 25 Aug 2016 23:22:19 +0000
(23:22 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 Aug 2016 23:22:19 +0000
(23:22 +0000)
am:
77dec89bb3
Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7
Trivial merge
OSDN Git Service
