Android m preview 1
Merge "Fix typo in javadoc."