GitLab

  Reported on android-porting mailing list (by "Anand Android").
  Also renamed a local that shadowed an earlier local.

Automated import of CL 143506