tree cdc61aedfc4d532bc59e94b8470d3fafbb43c917
parent 2d4d1b960963e1d75b8d531388ca59beb4179778
parent 984dc5c263ce2fed05dc466000201f74c98a8b34
author Tianjie Xu <xunchang@google.com> 1564017566 -0700
committer android-build-merger <android-build-merger@google.com> 1564017566 -0700

Merge "Clean up some global variables in common.h" am: 80c405f692 am: 168ce56022 am: 6f8e0ede72
am: 984dc5c263

Change-Id: I5df6ce9f82a0535c844b9474dbe57dc4e6e9e316