Merge remote-tracking branch 'origin/master'

diff --cc doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
index 0b4282f,015c120..5e973b6
--- 1/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
--- 2/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
+++ b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst
@@@ -284,9 -358,9 +358,9 @@@ AVD (*Android Virtual Device*) is not p
  
  Hardware Device
  ---------------
 -If you have an Android device, you can use it to test and debug your applications. This way is more authentic, though a little bit harder to set up. You need to make some actions for Windows and Linux operating systems to be able to work with Android devices. No actions are required for Mac OS. See detailed information on configuring hardware devices in subsections below.
 +If you have an Android device, you can use it to test and debug your applications. This way is more authentic, though a little bit harder to set up. You need to make some actions for Windows and Linux operating systems to be able to work with Android devices. No extra actions are required for Mac OS. See detailed information on configuring hardware devices in subsections below.
  
- You may also consult the official `Android Developers site <http://developer.android.com/tools/device.html>`_ for more information.
+ You may also consult the official `Android Developers site instructions <http://developer.android.com/tools/device.html>`_ for more information.
  
  Windows host computer
  ^^^^^^^^^^^^^^^^^^^^^