tree 6a34bf1f64a64b7394bcf3f07e8436430947dba9
parent f3d2517c053799e64906fd7e4f11a5725a2668fd
author Chet Haase <chet@google.com> 1286468840 -0700
committer Chet Haase <chet@google.com> 1286479752 -0700

Various fixes

Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee