3079afaaf5
Merge commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp * commit 'af8c900a18288ef4ddfa2cebfa0555b8a37f92a7': Use flattenToShortString instead of toShortString on ComponentNames to