AI 143241: am: CL 142791 am: CL 142789 Fix ClassCastException (bug #1736120)
  Original author: emillar
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143241
1 file changed