AI 145166: am: CL 145097 am: CL 144935 ApiDemos contains new API, and we must force the target to cupcake.
  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145166
1 file changed