Reconcile with jb-mr1-release - do not merge

Change-Id: I5143b75117c4289d7a95eb3d0649e52a6573afa8
am d4fbdc58: am a3a27fba: Fix NPE from snoozing.

* commit 'd4fbdc586f25849574518d9a4f75816f1067c132':
  Fix NPE from snoozing.
am 387f4745: am 7a2de3d0: resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy

* commit '387f4745c38f7adbb8ed359623d23e426bf473cb':
  Removed use of notification framework's cancelAll so we don't affect SyncAdapter's alerts.
am c14b5a5a: am d52514a2: Fixed bug causing incorrect result from pressing back-key while in day/week view after having modified the date in the date picker.

* commit 'c14b5a5ae63a15f0d76fc4a46cfb1ace9d7ccd20':
  Fixed bug causing incorrect result from pressing back-key while in day/week view after having modified the date in the date picker.
am 2167814f: am b0c50c10: (-s ours) am 41bae6dd: (-s ours) Fixed back-key bug in day/week view. DO NOT MERGE

* commit '2167814fa7b8b2aa50eb797561fccd627bbf9b11':
  Fixed back-key bug in day/week view. DO NOT MERGE
am e7c4b585: am 45461389: am c81d17c2: Changed widget header to include icon.

* commit 'e7c4b585058f53f91c759ad3e81edd9443107663':
  Changed widget header to include icon.
am 2167814f: (-s ours) am b0c50c10: (-s ours) am 41bae6dd: (-s ours) Fixed back-key bug in day/week view. DO NOT MERGE

* commit '2167814fa7b8b2aa50eb797561fccd627bbf9b11':
  Fixed back-key bug in day/week view. DO NOT MERGE
am e7c4b585: am 45461389: am c81d17c2: Changed widget header to include icon.

* commit 'e7c4b585058f53f91c759ad3e81edd9443107663':
  Changed widget header to include icon.
am 9550b835: am 7e2f06c8: am e25b43fb: Modify doScroll to move based on the average of the touch points

* commit '9550b835e1a467efe3c4b6132e29241f9b9842a4':
  Modify doScroll to move based on the average of the touch points
am 9550b835: am 7e2f06c8: am e25b43fb: Modify doScroll to move based on the average of the touch points

* commit '9550b835e1a467efe3c4b6132e29241f9b9842a4':
  Modify doScroll to move based on the average of the touch points
am 4e972bd8: am 7a17c953: am a498f6ed: Modify doScroll to move based on the average of the touch points

* commit '4e972bd8639b4584f3c28a83a9c35e664d803bb4':
  Modify doScroll to move based on the average of the touch points
am 4e972bd8: am 7a17c953: am a498f6ed: Modify doScroll to move based on the average of the touch points

* commit '4e972bd8639b4584f3c28a83a9c35e664d803bb4':
  Modify doScroll to move based on the average of the touch points
am 17e4c3ed: am c4a5fab2: am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other\'s alerts." into ics-ub-calendar-aqua

* commit '17e4c3ed3e928a4353df582a37661046114206e5':
  Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts.
am 17e4c3ed: am c4a5fab2: am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other\'s alerts." into ics-ub-calendar-aqua

* commit '17e4c3ed3e928a4353df582a37661046114206e5':
  Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts.
Reconcile with jb-mr1-release - do not merge

Change-Id: I174a66647f10ea74d34c3d20ff30c2ccd46dc156
am d42050d8: (-s ours) am 465811e6: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'd42050d8648f5cb2878e766b5cf0032ee30b36bf':
  Modify doScroll to move based on the average of the touch points
am d42050d8: am 465811e6: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'd42050d8648f5cb2878e766b5cf0032ee30b36bf':
  Modify doScroll to move based on the average of the touch points
am a6d51523: am bf1c2fbf: am 2c0c7744: Merge "Fix emailing guests from event info page when attendees aren\'t synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua

* commit 'a6d515236590c29c5e5f8ee200138a6faee663f0':
  Fix emailing guests from event info page when attendees aren't synced down (too many), by emailing only the organizer.
am a6d51523: am bf1c2fbf: am 2c0c7744: Merge "Fix emailing guests from event info page when attendees aren\'t synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua

* commit 'a6d515236590c29c5e5f8ee200138a6faee663f0':
  Fix emailing guests from event info page when attendees aren't synced down (too many), by emailing only the organizer.
am 8a45b6b9: am 41526e9b: am 8286d2f7: Fix default calendar used when creating/editing event for the first time.

* commit '8a45b6b9ab1a4a7ab7d07a481df0502ced6a1a66':
  Fix default calendar used when creating/editing event for the first time.