Autotest upstream merge.
Merged from d9d64b855363d214996b187380532d4cc9991d29 to
7bad38846fe9c74e42018131ce85aec2b5e6c7a9
BUG=none
TEST=emerge autotest, run bvt, smoke.
Change-Id: Ibe6462198e84e0d41fa160af086283cd712da4a6
Reviewed-on: http://gerrit.chromium.org/gerrit/7440
Tested-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
diff --git a/frontend/shared/resource_lib.py b/frontend/shared/resource_lib.py
index fff8ff0..86cc583 100644
--- a/frontend/shared/resource_lib.py
+++ b/frontend/shared/resource_lib.py
@@ -322,7 +322,7 @@
def __init__(self, request, instance):
assert self.model is not None
- super(Entry, self).__init__(request)
+ super(InstanceEntry, self).__init__(request)
self.instance = instance
self._is_prepared_for_full_representation = False