OSDN Git Service

resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp
authorSharvil Nanavati <sharvil@google.com>
Fri, 4 Sep 2015 02:07:55 +0000 (19:07 -0700)
committerSharvil Nanavati <sharvil@google.com>
Fri, 4 Sep 2015 02:07:55 +0000 (19:07 -0700)
commitb3ca1b3756cb8682045456526aee924cd0290da5
treee4584e11bbd281d1592f2795701b556ba56da924
parentb4f082b454ae3c1b278cd45f25f5151dbf49ee2c
parenta905eb629671d248bf8a60ce7a1e66efd6666664
resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp

Change-Id: I331ff78fefe13bd6fddd74d5c7e27f35dcd1c419
hci/Android.mk
osi/Android.mk
osi/src/alarm.c