tree e0f7b84a4ec05cd7175384512b5ca617e2221603
parent cd893d57e1e5e695fb26d14fb37f0fa3b3fe1971
author Jeff Hamilton <jham@android.com> 1271181882 -0700
committer Jeff Hamilton <jham@android.com> 1271181882 -0700

Fixup a few things pointed out in review.

Change-Id: Ib754744414b80785a545f8dcc6d74487ff15338b