tree eb089f00e78f1316d33cc395fc571fb6a9b54d6a
parent beaf0cfde71d9b5c473cb13d4ffe6285a346f2e8
parent f5259a201dae2e25dffabbece3f66d931a7d8dd7
author Lajos Molnar <lajos@google.com> 1401302441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401302441 +0000

am f5259a20: Merge "Fix VirtualDisplayTest by putting image checking task to an non-UI thread"

* commit 'f5259a201dae2e25dffabbece3f66d931a7d8dd7':
  Fix VirtualDisplayTest by putting image checking task to an non-UI thread