| commit | 7baa5212c24f283fad1eda53d6ef0fd01f1501db | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Mar 30 22:37:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 30 22:37:35 2016 +0000 |
| tree | f8c4ad01c5d1ab29557adb3552da47e5aae08b1b | |
| parent | 05b3ab5d892363c30e52817d42e57f852d11ffd0 [diff] | |
| parent | d17f96ae007179007765c0f75b6bffb13c9285cb [diff] |
Merge "Allow multiple Resources associated with an Activity" into nyc-dev am: d17f96a * commit 'd17f96ae007179007765c0f75b6bffb13c9285cb': Allow multiple Resources associated with an Activity Change-Id: I34dd24af289d3384deb72cf66ba076b2f7cfd2e8