am 3530ebe4: resolved conflicts for merge of 578e73da to honeycomb-plus-aosp

* commit '3530ebe451fea39b159baa9b8c9f9cd851de42a3':
  Fix 3106227: use WeakReferences for receivers in DigitalClock class