OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1192e52 5563e1a)
resolve merge conflicts of e6f74e0 to nyc-mr1-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Sat, 20 Aug 2016 00:15:42 +0000 (00:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 Aug 2016 00:15:42 +0000 (00:15 +0000)
am: 5563e1ae3d

Change-Id: I4acf4ef5cbab73fe67103a1ad094cfd600ac04a0


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