tree b717af1949faca40739282bb18d2df17d8fd0a18
parent 90183823b00ad5ce04948cf03d827a47c82ca445
parent 3348f14b3d46b172a5b557f81aac526b7e8bf5fb
author Costin Manolache <costin@google.com> 1254290333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254290333 -0700

am 3348f14b: Remove GAIA string

Merge commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp

* commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
  Remove GAIA string