Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 29 insertions, 0 deletions

diff --git a/python/helpers/pydev/tests_python/_debugger_case14.py b/python/helpers/pydev/tests_python/_debugger_case14.py
new file mode 100644
index 000000000000..2a5e181b041f
--- /dev/null
+++ b/python/helpers/pydev/tests_python/_debugger_case14.py
@@ -0,0 +1,29 @@
+
+class Car(object):
+    """A car class"""
+    def __init__(self, model, make, color):
+        self.model = model
+        self.make = make
+        self.color = color
+        self.price = None
+
+    def get_price(self):
+        return self.price
+
+    def set_price(self, value):
+        self.price = value
+
+availableCars = []
+def main():
+    global availableCars
+
+    #Create a new car obj
+    carObj = Car("Maruti SX4", "2011", "Black")
+    carObj.set_price(950000)  # Set price
+    # Add this to available cars
+    availableCars.append(carObj)
+
+    print('TEST SUCEEDED')
+
+if __name__ == '__main__':
+    main()