tree 6fbe5e0f4837b22a6b48077e58ae99fbc70becad
parent 5b1a2ec48a6a65e3c9f0fac95ae36cd41fbd8e81
parent efaac3d4d77c76a02042746c93712d80b965c0c0
author Winson Chung <winsonc@google.com> 1338924345 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338924345 -0700

am efaac3d4: am bbf595dc: Merge "Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)" into jb-dev

* commit 'efaac3d4d77c76a02042746c93712d80b965c0c0':
  Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)