Merge commit 'c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair * commit 'c9b04450ef204e03de3f3da886cd45808550dfbc': Fix potential NPE in manifest editor when switching SDKs
Merge commit 'c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair * commit 'c9b04450ef204e03de3f3da886cd45808550dfbc': Fix potential NPE in manifest editor when switching SDKs