| commit | d17f96ae007179007765c0f75b6bffb13c9285cb | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Mar 30 22:33:29 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 30 22:33:30 2016 +0000 |
| tree | e52b499e1b3d5f13d0b107a332543279434f1296 | |
| parent | a004ed7789fd3d9a2d11a5019a463ea5572629b0 [diff] | |
| parent | 7f3f49988799dc85992eedd16135515177c09dd7 [diff] |
Merge "Allow multiple Resources associated with an Activity" into nyc-dev