tree 2295b94134e4dc628b593f29b7fc3dd6cd64a3fc
parent 5504a49ad41a202551e0d932f58c756e6da607a6
parent 9cdc6db89f4b685a1ecda8236bf6c97f199d5680
author Android Build Merger (Role) <android-build-merger@google.com> 1500617641 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500617641 +0000

Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am: f9b05eeb5f am: 36c08c7b8b" into oc-mr1-dev-plus-aosp