OSDN Git Service

Merge \\"Remove dependency on android_alarm.h.\\" am: c95e7a3014
authorChristopher Ferris <cferris@google.com>
Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)
am: 8f7223e420

Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8


Trivial merge