OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1888c1f e37a780)
am e37a7807: am 7fbf06c2: am 2af0bb6e: Fix merge discrepencies and resulting compile...
authorAndre Eisenbach <eisenbach@google.com>
Mon, 19 Oct 2015 19:54:56 +0000 (19:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 19:54:56 +0000 (19:54 +0000)
* commit 'e37a780798cf0179f10b7baec1f48114944b7749':
  Fix merge discrepencies and resulting compile errors


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