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

* commit '5d87d51fab7e17793413c9095028963117e276b8':
  Make ResolverActivity update dynamically.