tree 8955da8483e05a91ecdf0e69136206ee2fefd5c8
parent 1928af7eb684836932e42842b7f40529858d54c8
author Dirk Dougherty <> 1240114347 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240114347 -0700

AI 146574: am: CL 146346 am: CL 146342 g4 integrate -t -i -b platform-1_0-to-cupcake @141805,141805 (doc change)
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146574