tree 40663ea59319c8bb8b5805e33181208dcf474076
parent 4369a0dcc26b6298a4bba44a732b6f270a593f79
parent a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773
author Brian Muramatsu <btmura@google.com> 1349301079 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349301079 -0700

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

* commit 'a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773':
  Specify workspace resource in preload broadcast