tree d1320c0b8da3257168cf2c753204fdc501ac7e0f
parent a087302da75eba0e14b4030a3db76593b313c986
parent 4692e5d8c8000600bc4c59c5f2b5fb5177dd0758
author Elliott Hughes <enh@google.com> 1466032723 +0000
committer android-build-merger <android-build-merger@google.com> 1466032723 +0000

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

Change-Id: Idf78bf71a0670997da754d0de93691db313aed57