am d4202c9d: am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1

* commit 'd4202c9d138459a60fde708ecda995f3b599d252':