tree c7eb2810f82231fad7e1394f84a9bf1d889a219c
parent a2d1ad36af53a2c9f55c82c452f47d5b8b7ed70c
parent 11320079f69879ffcf5881f83382ae03449aea73
author Jake Hamby <jhamby@google.com> 1320278667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320278667 +0000

am 11320079: resolved conflicts for merge of 486c1d0d to ics-mr1

* commit '11320079f69879ffcf5881f83382ae03449aea73':
  STK: Fix ActivityNotFoundException in 'launch browser' cmd.