am 6a326fff: am a421c423: Merge "miscellaneous cleanup in anticipation of permissions work" into ub-deskclock-business
am 6a326fff: am a421c423: Merge "miscellaneous cleanup in anticipation of permissions work" into ub-deskclock-business

* commit '6a326fffb1fe6b060814822d45926542d270b55e':
  miscellaneous cleanup in anticipation of permissions work

OrBin/SynClock-Android