OSDN Git Service

am 306f903f: Merge change I994fc479 into eclair
authorJeff Sharkey <jsharkey@android.com>
Fri, 30 Oct 2009 02:34:37 +0000 (19:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Oct 2009 02:34:37 +0000 (19:34 -0700)
Merge commit '306f903ffb9aa39bb3833fa052f24a37dfed2a4f' into eclair-mr2

* commit '306f903ffb9aa39bb3833fa052f24a37dfed2a4f':
  Send RESULT_CANCELED when missing, return legacy Uris.


Trivial merge