tree af6a114b832449c7a354ddd9010ceef9e8ab987e
parent 349ef841374a0dc016883e7bb7260b988b6a0c7c
parent c8ddd2d7809b9ee490444193bb0b919c1b6bdc4c
author Robert Greenwalt <rgreenwalt@google.com> 1372369732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372369732 -0700

am c8ddd2d7: Fix CTS test for scan-always-available env

* commit 'c8ddd2d7809b9ee490444193bb0b919c1b6bdc4c':
  Fix CTS test for scan-always-available env