tree e24c2b2fbde1db7f15dfb6502813aee870c8ef55
parent 6b3ea951718c5a1c56a01279add6cf25197148f9
author Brad Fitzpatrick <bradfitz@android.com> 1284159809 -0700
committer Brad Fitzpatrick <bradfitz@android.com> 1284159809 -0700

Fix build caused by automerger and missing imports in master.

gingerbread had an import android.os.*.  master doesn't.  auto-merger
applied it fine, but it doesn't compile.

Change-Id: I28d7b5053616a40223eeb29a0669831d5ca76d9e