Merge "Document escaping"

am: 89574e0c40

Change-Id: I5a86b42805964fe95e919a35e33ec7c8f9468d16

README.md

@@ -81,6 +81,8 @@ types are:
 Maps may values of any type, including nested maps.  Lists and maps may have
 trailing commas after the last value.
 
+Strings can contain double quotes using `\"`, for example `"cat \"a b\""`.
+
 ### Operators
 
 Strings, lists of strings, and maps can be appended using the `+` operator.

java/droiddoc.go

@@ -211,6 +211,7 @@ type JavadocProperties struct {
 	// Available variables for substitution:
 	//
 	//  $(location <label>): the path to the arg_files with name <label>
+	//  $$: a literal $
 	Args *string
 
 	// names of the output files used in args that will be generated