am c98ba511: Fix http://b/2305223
am c98ba511: Fix http://b/2305223

Merge commit 'c98ba511cbc433951f787ca9e9bd4472c18e4ab8' into eclair-mr2-plus-aosp

* commit 'c98ba511cbc433951f787ca9e9bd4472c18e4ab8':
  Fix http://b/2305223

dseuss/deskclock,dseuss/deskclock,OrBin/SynClock-Android