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

* commit '921e83039d266b6d288fd5e09160d878eccb9e23':