am 3348f14b: Remove GAIA string

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

* commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
  Remove GAIA string