tree d1320c0b8da3257168cf2c753204fdc501ac7e0f
parent c58d7dda8c12d179b2e702da52370b8db3fe4e6c
parent 37450d7f427345aee463b1ff730d0b2ff18ff57b
author Elliott Hughes <enh@google.com> 1466032574 +0000
committer android-build-merger <android-build-merger@google.com> 1466032574 +0000

Merge \"Remove an abused global so we can actually see logging.\"
am: 37450d7f42

Change-Id: Id9c78be08f2822ec92d54ba11693d3e5adb7b5aa