tree 91dc132b211a55835cf6ff3e54611a55e8a13f05
parent 7848f4e9c1a50fa36ddcce692b11ee713df14cb8
author Anthony Lee <anthonylee@google.com> 1394235344 -0800
committer Yu Ping Hu <yph@google.com> 1395276842 +0000

Fixed some small changes that were brought up by CL 430679.

Change-Id: I3fca0292a1422a7e4e54f22bda90b08d2e1bffae
(cherry picked from commit 18e8674b45944237bd218d1106b7c3793fa7fba9)