merge from open-source master

Change-Id: I48def3afdbc7ac72ea624d8ad350c4722262690e

docs/html/resources/articles/painless-threading.jd

@@ -108,7 +108,7 @@ you. Our previous example can easily be rewritten with
   new DownloadImageTask().execute("http://example.com/image.png");
 }
 
-private class DownloadImageTask extends AsyncTask<string, void,="" bitmap=""> {
+private class DownloadImageTask extends AsyncTask<String, Void, Bitmap> {
      protected Bitmap doInBackground(String... urls) {
          return loadImageFromNetwork(urls[0]);
      }