tree 96ffad00eeb0d3367b19395fb8c756e165279acf
parent 46f388ce7db5a88c34ddbd2cf7fef15b6ccfe943
parent 0fd740c5115b122a9b41f57fc325ab2b3cdc882c
author Chia-I Wu <olv@google.com> 1501766037 +0000
committer android-build-merger <android-build-merger@google.com> 1501766037 +0000

Merge "libsurfaceflinger: handle WINDOW_TYPE_DONT_SCREENSHOT" into oc-dr1-dev am: 1e9bf7c91b am: ebc55de1a8
am: 0fd740c511

Change-Id: I427ba9348e63a390407453d12a9dd7b226c9daee