tree c450413cf7a574bcc45303a285ade3010119e77b
parent 687532081f802e891e83dbf70824d504f9a0d34b
author Xavier Ducrohet <> 1239335194 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239335194 -0700

AI 145660: am: CL 145622 am: CL 145380 Fixes for add-on build
  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145660