tree 3e04ffac75e2d897d249ee7ea4bb52d10643e703
parent 3d6c56914052228d7772517acd51952467947b69
parent 40b4e23a0396614c841977e932218e3f53089a4a
author Dan Stoza <stoza@google.com> 1422402176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422402176 +0000

am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

* commit '40b4e23a0396614c841977e932218e3f53089a4a':
  Revert "SurfaceFlinger: Attempt to attribute fds to layers"