OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8181b67 11cf5cc)
am 11cf5ccd: resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Thu, 11 Dec 2014 22:44:42 +0000 (22:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Dec 2014 22:44:42 +0000 (22:44 +0000)
* commit '11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d':
  Cleanups needed to make clang happy


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