tree 9dc5f94783d417f88c45caf11807edc7e8303330
parent d0412c2c120d6b51e8add50c044c459daf83c70b
parent 627d9467d3f797d08c864cdf5a0785d0a57b8e61
author Anjali Koppal <akoppal@google.com> 1399332590 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399332590 +0000

am 627d9467: Merge "Add setters for mWorkspaceLoading and mWaitingForResult." into ub-now-nova

* commit '627d9467d3f797d08c864cdf5a0785d0a57b8e61':
  Add setters for mWorkspaceLoading and mWaitingForResult.