OSDN Git Service

resolved conflicts for b8cc54d1 to mnc-dr-dev-plus-aosp
authorSharvil Nanavati <sharvil@google.com>
Tue, 15 Sep 2015 04:21:24 +0000 (21:21 -0700)
committerSharvil Nanavati <sharvil@google.com>
Tue, 15 Sep 2015 04:21:24 +0000 (21:21 -0700)
commitccac993b3c35bf7d2dfe8b503dd5e4c0d6679d6f
tree5531c85630259eb7a6d4b310196061ccf74016c3
parent205cc406bd3a6a234ee14dc532aa2424b02d9454
parentb8cc54d161df88ef4316ef050d8a74a724b8d454
resolved conflicts for b8cc54d1 to mnc-dr-dev-plus-aosp

Change-Id: I157c86604ccaf0635bdf9a132145af3552407cd0
osi/src/alarm.c