tree 5536fcd4c62c14ef3b43f67e0545490bbdbe44a3
parent b59399996544c66628d9a0cbc1188fe8f1141be0
parent 2bbfe98062d69fbe5dd5d924f385741f9ba4b2ff
author Christopher Tate <ctate@google.com> 1472507763 +0000
committer android-build-merger <android-build-merger@google.com> 1472507763 +0000

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am: 2bbfe98062

Change-Id: I30577f5760dabfc39faa117a9c9f8939b9cad49d