tree a8ac5a4c7de7fc8cbe898d6c27b8b96a4696985b
parent c55180c8a8ee9950c6306dfc47bd7dbbe2bd016b
parent 67463061850da489782b5023e0a6178e06f602fb
author Nick Kralevich <nnk@google.com> 1411863812 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411863812 +0000

am 67463061: am 9d5f5d0e: Merge "Add domains for goldfish services."

* commit '67463061850da489782b5023e0a6178e06f602fb':
  Add domains for goldfish services.