OSDN Git Service

DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc...
authorSharvil Nanavati <sharvil@google.com>
Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)
committerScott James Remnant <keybuk@google.com>
Tue, 20 Oct 2015 22:23:21 +0000 (15:23 -0700)
commite60250577ddd55c013f47a93946ce6367457b316
tree1902ba9de3fb07d79d28fe34fef8d7e242344309
parent8430b3d258c532b2881dba4228bf58ae5a7bb364
DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp"

This reverts commit 2f86b2fc188edb0ba50483e624bd982a594c6633, reversing
changes made to 15c3ad9c08b864f63ed2581a10a65107fbe04752.

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