tree 68502a20e297f4dab20c32d2b6d4f9a614d1a99f
parent 7153f04882145959f82e84007d72fa6c393a7e66
parent 2c03020da7d2876beb7ce2191a9c3570fd07061b
author Dirk Dougherty <ddougherty@google.com> 1274989042 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274989042 -0700

am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo

Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken

* commit '9eae957207c016db032819eadef261addf994a0d':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.