OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e91e2a d395be3)
resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours am: 8e80a260...
authorSharvil Nanavati <sharvil@google.com>
Wed, 22 Jun 2016 01:31:04 +0000 (01:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:31:04 +0000 (01:31 +0000)
am: d395be3fc5

Change-Id: I3ff54fa4ffe471bc0c68422f08163494f6f97ec2


Trivial merge
system/bt
About OSDN
Find Software
Develop Software
Help