am 134efd4b: am 9463551d: Fix http://b/2232909 .
am 134efd4b: am 9463551d: Fix http://b/2232909 .

Merge commit '134efd4bfb3495105daaebe37a9b21916c21a18d' into eclair-mr2-plus-aosp

* commit '134efd4bfb3495105daaebe37a9b21916c21a18d':
  Fix http://b/2232909 .

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