tree 0974ca56794822b56b1c7081ff8a1f140f53ec53
parent 49b02f75eba649d696813bbfaeb87658d0e5b6c3
author Rebecca Schultz Zavin <rebecca@android.com> 1247873282 -0700
committer Rebecca Schultz Zavin <rebecca@android.com> 1247873282 -0700

Remove redundant defines, these were only necessary while changes were
being staged to another repo

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>