tree 81badc51cd230a80ad58d7cf458b841a6fc059cd
parent 8f559c1cbd52fe5b9c5175aa654ad15873012714
parent dbd5569923ca67472e54ff31c03e3282fd20168a
author Steven Moreland <smoreland@google.com> 1500931907 +0000
committer android-build-merger <android-build-merger@google.com> 1500931907 +0000

Merge "Remove some global headers." am: 7285e9adce
am: dbd5569923

Change-Id: I0e0bed76a75e509be722f4fd4e14762fc3e888c2