tree be37fd541baffee72cc76094588d934d58d88977
parent 5211528b9d1f51dca284d40e8d63dc3bc9527ac7
parent 1cd5afc135b0aea3249219fcfb393d9bd9b53ec2
author John Reck <jreck@google.com> 1437514363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437514363 +0000

am 1cd5afc1: am 9317d0b9: am 1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev

* commit '1cd5afc135b0aea3249219fcfb393d9bd9b53ec2':
  Mark isInUse per-window