OSDN Git Service

(root) / android-x86 / system-bt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbdb081 b22aeb2)
am b22aeb23: resolved conflicts for c196f214 to stage-aosp-master
authorPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)
* commit 'b22aeb23fa102920199f2a537e6628bc8c3781eb':
  GKI cleanup - Moved GKI_get_os_tick_count() to OSI


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