OSDN Git Service

am 59afce1d: am cf1af9a1: Merge change I14fec660 into eclair
authorNeel Parekh <neel@google.com>
Mon, 5 Oct 2009 23:32:14 +0000 (16:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Oct 2009 23:32:14 +0000 (16:32 -0700)
commit13c29c6df6f801de413bc25b73500a0b97ab1a72
treefcb58fe49459944f9b20c8834529701528fff410
parent111c307707e90f8807a0ffff19c3ea325235a276
parent59afce1d545349adffc30978b73ad34096608998
am 59afce1d: am cf1af9a1: Merge change I14fec660 into eclair

Merge commit '59afce1d545349adffc30978b73ad34096608998' into eclair-mr2-plus-aosp

* commit '59afce1d545349adffc30978b73ad34096608998':
  Fix NPE being thrown when starting the AttachImage activity.