tree a85e4395bcaa62216822fe45a97da0e670111f41
parent 1011032570ca9c88cd15049a6438e7ed88ef0a16
parent 3372cc25df255b94e4eb75920afaf43ee5edc39f
author Dan Stoza <stoza@google.com> 1421456015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421456015 +0000

am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp

* commit '3372cc25df255b94e4eb75920afaf43ee5edc39f':
  SurfaceFlinger: Attempt to attribute fds to layers