Hey Tao,

We can't remove this logic "entry.getName().replaceFirst( entryToStart, "")" as it is required by new Android wizard.  However, we do need to check before this line to see if entryToStart is null.  

So can you create a new local variable called 'entryName' that will either be 'entry.getName()'  if entryToStart is null, or 'entry.getName().replaceFirst(entryToStart,"") if it is not?