OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75232a5 b4e3447)
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am:...
authorPavlin Radoslavov <pavlin@google.com>
Wed, 15 Mar 2017 06:09:23 +0000 (06:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 06:09:23 +0000 (06:09 +0000)
am: b4e34476e9  -s ours

Change-Id: I5fe69742472d5a419f6757fbb64df0099cf53748


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