tree 40663ea59319c8bb8b5805e33181208dcf474076
parent 30e64f52211e7691a88eb2dcbf16ba6f1635e302
parent 5524b4957fc7c1c858037327429411efdb8fe7d6
author Brian Muramatsu <btmura@google.com> 1349300851 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349300852 -0700

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