AI 146838: am: CL 146778 am: CL 146776 fix NPE in AvdManager
  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146838
1 file changed