am 8e5b540c: am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp
am 8e5b540c: am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp

* commit '8e5b540cffeac75f698020b9fbbb24dcd7d6b061':
  Allow uninstallable APPs.

xorware/android_build,see4ri/lolili,hagar006/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,fallouttester/platform_manifest,pranav01/platform_manifest,xorware/android_build,Hybrid-Power/startsync,xorware/android_build,knone1/platform_manifest,xorware/android_build,ND-3500/platform_manifest