am: 7baa521
* commit '7baa5212c24f283fad1eda53d6ef0fd01f1501db':
Allow multiple Resources associated with an Activity
Change-Id: I4aa2b500028ef733e9ed9708447743f4771ae781
am: 7baa521
* commit '7baa5212c24f283fad1eda53d6ef0fd01f1501db':
Allow multiple Resources associated with an Activity
Change-Id: I4aa2b500028ef733e9ed9708447743f4771ae781