tree 037f25bec54d739b776599e960867f00280c15f5
parent a819de28235252eec5e7080f797472b68e297b11
author Urs Grob <> 1239330134 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239330134 -0700

AI 145615: am: CL 145291 Fixes from the review of 'Bringing XNET down to zero broken tests.'
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 145615