OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e3d614
41ddf54
)
DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc...
author
Sharvil Nanavati
<sharvil@google.com>
Tue, 20 Oct 2015 02:22:48 +0000
(
02:22
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Oct 2015 02:22:48 +0000
(
02:22
+0000)
am:
41ddf544d0
-s ours
* commit '
41ddf544d038e3ae0a26b6989bfb3d6727161e84
':
DO NOT MERGE Revert "am
b3ca1b37
: resolved conflicts for merge of
a905eb62
to mnc-dr-dev-plus-aosp"
Trivial merge