tree 8ab93d59eb931f81cbe362fbcef9a21658103474
parent 23274614dab35cc56f4239378ef48d6f5a17aacd
parent 365604c300a3873b22cd52dc341e6d19059b2ff9
author Elliott Hughes <enh@google.com> 1515548774 +0000
committer android-build-merger <android-build-merger@google.com> 1515548774 +0000

Merge "Remove obsolete workaround." am: f448371208
am: 365604c300

Change-Id: Ia153c371b8833b926b3e643bf265e67a438dfd91