tree d38ee879d9135fa2701ea3ec4e7b7543340f860c
parent 0c4a76959a27918adf29b440cb6e3ce2d14c0497
parent 18acb55de526e479f59b3f8d1f3b348cad126cbb
author Dianne Hackborn <hackbod@google.com> 1445904902 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1445904902 +0000

Merge "Bring back the sensing alarm.  We need it!"