tree b91e77a2683613745d07e4fdbfdac27fe62c2c21
parent adf8a003e8414eb296b0e0b72d88ae3c6d34921c
author Yunlian Jiang <yunlian@google.com> 1360880970 -0800
committer ChromeBot <chrome-bot@google.com> 1360951940 -0800

Add CL 42410 to this R25 branch

BUG=None
TEST=local entry into chroot

Change-Id: I62107b92e6ef4f4aeb604b6dcf9a7008553642e9
Reviewed-on: https://gerrit.chromium.org/gerrit/43324
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>