Android 4.3 release 2.1
Merge "Fixed Maps.java comment to reflect current code"