AI 147239: am: CL 147238 Update tools index, replace activitycreator with android
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147239
5 files changed