tree f4cd49113f57639472c739d84e3fc12e883f5edb
parent 0ada814a36a86e87af1b03de8482620684c4b17c
parent 6d61faad436f3bae41c6008ffe3e03a19eb4c277
author Dianne Hackborn <hackbod@google.com> 1383688583 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383688583 -0800

am 6d61faad: am d64744cc: Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev

* commit '6d61faad436f3bae41c6008ffe3e03a19eb4c277':
  Help out with issue #11497149: Clock app crashes when opened during...