| commit | 3890c83721f93f52a7b15de65870db1d77ee1e72 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Tue Jan 27 23:42:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 27 23:42:56 2015 +0000 |
| tree | 3e04ffac75e2d897d249ee7ea4bb52d10643e703 | |
| parent | 3d6c56914052228d7772517acd51952467947b69 [diff] | |
| parent | 40b4e23a0396614c841977e932218e3f53089a4a [diff] |
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"