tree 61a7440b6cb06e957a5061a7e0f2b40e397c0c2a
parent cd77dffe55f14ac6145fb232cc53150165493661
parent bc0caf802e5eb08b6565bbe3a535cb2fca826d8b
author Jean-Baptiste Queru <jbq@google.com> 1240427399 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1240427399 -0700

Merge commit 'goog/readonly-p4-donut' into HEAD

Conflicts:
	location/java/android/location/Geocoder.java