tree 0d964f3d860da6a1353878cb2c0dc1cd4da93627
parent 7d84cc28549e1c2e3d5cf3182dd4fee6d98c7a6a
parent 7610962d39e36be489798ce99c3915e6224f7af4
author Brian Muramatsu <btmura@google.com> 1349301192 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349301192 -0700

am 7610962d: am a2042d0a: Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev

* commit '7610962d39e36be489798ce99c3915e6224f7af4':
  Specify workspace resource in preload broadcast