tree 0d956c620e278e81f4b219cba02b8a559e35cbad
parent 0933806b5d6896b735326333fc657d304f30657a
parent b09f45ad825ace09f01e725fa31fc2583c179e57
author Pablo Ceballos <pceballos@google.com> 1462567145 +0000
committer android-build-merger <android-build-merger@google.com> 1462567145 +0000

Merge "Merge "libgui: Prevent segfaulting in abandoned ConsumerBase" into nyc-dev am: 39e4428c81 am: 6096a3a949" into nyc-mr1-dev-plus-aosp
am: b09f45ad82

* commit 'b09f45ad825ace09f01e725fa31fc2583c179e57':

Change-Id: If101e60a69526615cfef021629dc8f65db7f0c91