tree 078917028e2c0fa70394e9444733a1c6d4c253cc
parent 578b422a9a0fb4b2fcca6e9fb8568ea03d2c8a46
parent 5bed4107d2452c7a5cbc8dbf8b737e66c06094ef
author The Android Open Source Project <initial-contribution@android.com> 1339080926 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339080926 -0700

am 5bed4107: Reconcile with jb-release nakasi-factoryrom-release

* commit '5bed4107d2452c7a5cbc8dbf8b737e66c06094ef':
  Fixing ConcurrentModificationException (issue 6619380)
  Defer loading widget previews until after All Apps transition
  Fix workaround for crashing on rotation. (Bug 6611883)
  Workaround for crashing on rotation. (Bug 6611883)
  Fixing issue with resource ids. (Bug 6532243)