AI 146572: am: CL 146343 am: CL 146340 Integrate updated SDK Terms and Conditions document
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146572
2 files changed