tree 8f6da6061ffeb7f7d76f09a2c37e609ef2529194
parent f481f53de2004cbe848da3fe45f132f5f233e3fa
author Joe Onorato <> 1239992132 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239992132 -0700

AI 146738: am: CL 146687 The maps and gtalkservice libraries were still being included in
  all of the builds.  Fix that.
  We really need to get this generic_with_google product out of
  build/target and into vendor/google, but that can come later.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 146738