OSDN Git Service

Merge "Rename net_test_bluedroid to net_test_bluetooth" am: c2ad136c3e
authorAndre Eisenbach <eisenbach@google.com>
Mon, 2 Nov 2015 20:49:22 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Nov 2015 20:49:22 +0000 (20:49 +0000)
am: 028f32f35f

* commit '028f32f35fe62279e5e6ea7c9056b08109d8cb08':
  Rename net_test_bluedroid to net_test_bluetooth

1  2 
osi/src/alarm.c

diff --cc osi/src/alarm.c
Simple merge