tree df69c892912f8a8e33aff5cb3fefbedcd279f87b
parent 7cc73b7ad992dc0972601cc706eaefef29a729d4
parent fe79541b5cc5a490dd3a5b2e68f884fdfad4ca76
author Lorenzo Colitti <lorenzo@google.com> 1250643981 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250643981 -0700

am fe79541b: Enable IPv6.

Merge commit 'fe79541b5cc5a490dd3a5b2e68f884fdfad4ca76'

* commit 'fe79541b5cc5a490dd3a5b2e68f884fdfad4ca76':
  Enable IPv6.