OSDN Git Service

am cae219fe: (-s ours) Shutdown alarm callbacks on stack disable; added OSI module
authorAndre Eisenbach <eisenbach@google.com>
Wed, 10 Jun 2015 21:29:26 +0000 (21:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 21:29:26 +0000 (21:29 +0000)
* commit 'cae219fe70124f1fc39cd7a78c239c4870422d5d':
  Shutdown alarm callbacks on stack disable; added OSI module


Trivial merge