am 85e3e114: (-s ours) am 8031353c: Merge "b/2925976 Save attendance response and reminders onPause - do not merge" into gingerbread

Merge commit '85e3e114b901163061c350341212717b588137ac'

* commit '85e3e114b901163061c350341212717b588137ac':
  b/2925976 Save attendance response and reminders onPause - do not merge