OSDN Git Service

am e42d3d4c: am 8d92caac: am 9f3d01d9: volume button cancels ongoing countdown preven...
authorSpike Sprague <spikuru@google.com>
Fri, 15 May 2015 17:09:51 +0000 (17:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:09:51 +0000 (17:09 +0000)
* commit 'e42d3d4cc1b39d01a093691d1a5d0f731b1c4811':


Trivial merge