OSDN Git Service

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


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