Merge branch 'MDL-52670-master' of git://github.com/jleyva/moodle

Conflicts:
	lib/db/services.php

diff --cc mod/quiz/db/services.php
index b3e21d3,792445d..da470cb
--- 1/mod/quiz/db/services.php
--- 2/mod/quiz/db/services.php
+++ b/mod/quiz/db/services.php
@@@ -43,7 -42,14 +43,15 @@@ $functions = array
          'methodname'    => 'view_quiz',
          'description'   => 'Trigger the course module viewed event and update the module completion status.',
          'type'          => 'write',
 -        'capabilities'  => 'mod/quiz:view'
 +        'capabilities'  => 'mod/quiz:view',
 +        'services'      => array(MOODLE_OFFICIAL_MOBILE_SERVICE)
      ),
+ 
+     'mod_quiz_get_user_attempts' => array(
+         'classname'     => 'mod_quiz_external',
+         'methodname'    => 'get_user_attempts',
+         'description'   => 'Return a list of attempts for the given quiz and user.',
+         'type'          => 'read',
+         'capabilities'  => 'mod/quiz:view'
+     ),
  );