tree dfcc387680bfccb04745bd2281d1334f46f0fd86
parent 5d12096cd22a875d7e1652cd4f6efdcad63689a7
author Wink Saville <wink@google.com> 1266599123 -0800
committer Wink Saville <wink@google.com> 1266599123 -0800

DO NOT MERGE; Add back support for uts testing.