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

* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.