completing merge
Add a manifest attribute to indicate unit tests. This is useful for demonstrating Gaia UI tests
This is for issue #481
Added sim_contacts to get sim contacts.
removed comment.
Merge branch 'desktop' of https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Modified according to zac's suggestion
modified according to suggestion
modified by pep8 standard
modified according to pep8
Gallery app object
Cleaning up code
Gallery app obj
delete conflict file before merging
Merge https://github.com/mozilla/gaia-ui-tests into cost_control_reset
Merging with current head and adding items in manifest of cost control app
First Commit
Gallery page obj
Merge branch 'master' of https://github.com/mozilla/gaia-ui-tests.git into gallery-app-obj
Migrate test_gallery_delete_image.py