tree 8677be221f5501504391207c3d55a383bb93453c
parent f4ba7833af54ad6a75803dd678acac57c7f9e26b
parent 77420269fe36e693efd8e78d047a90c7d4fbb66b
author Griff Hazen <griff@google.com> 1432259445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432259445 +0000

am 77420269: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit '77420269fe36e693efd8e78d047a90c7d4fbb66b':
  Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE