Merge "Updated alarm notification" into honeycomb-mr1