tree 0922610dd702d3252dff7f10d7cd0679f2c42700
parent fd256c977add88ac4b25c9d9aa09a8205e060321
parent 39cf8b4944bbbaeeabae357ef2122bfc4457f211
author Chia-I Wu <olv@google.com> 1496763772 +0000
committer android-build-merger <android-build-merger@google.com> 1496763772 +0000

Merge "surfaceflinger: fix layer count" into oc-dev
am: 39cf8b4944

Change-Id: I6a7c3ebc27831792be6329ac6083c86c61f01499