tree 3e3bf09a3353d7acdbcb35dd410ea77150f41ebc
parent eb8a0b0d4566fd3e21bbd92634f13bb11fe7d3ac
parent 4f497122c361cb74eca4f44898bc05afeebb554b
author Max Nash <maxwelln@google.com> 1433451773 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433451773 +0000

am 4f497122: Merge "Add missing already_scanning string" into lmp-mr1-dev

* commit '4f497122c361cb74eca4f44898bc05afeebb554b':
  Add missing already_scanning string