OSDN Git Service

am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
authorRaphael <raphael@google.com>
Thu, 22 Oct 2009 05:22:16 +0000 (22:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:22:16 +0000 (22:22 -0700)
commit6dd35cda7031c8b122765069be43637caec514ed
treed4d21f0e3b134805bb9f8c22084bb90f11a802fc
parent640a05fe5dfb3d89e7fa76d1316323a5e2e8656c
parent57f2b852009ec8b6337f7c837b09fb1ff4bdeb1e
am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk

Merge commit '90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-mr2

* commit '90b60a3985d07f6113d91737fcd37da2d282ce8f':
  Fix potential NPE in manifest editor when switching SDKs