tree 42e8d4bf48c35810a65a428f2ccf7d917e0e5d01
parent 37d7bd1fd174d3d22169ffc9a39b9c72c76fa21d
parent 46624e83ba85aeaafe9d8543cf6088c3959a513d
author Wei Li <sirius.liwei@huawei.com> 1517275576 +0000
committer android-build-merger <android-build-merger@google.com> 1517275576 +0000

Merge "Move static variable out of should_trace()." am: 4cd3550d50
am: 46624e83ba

Change-Id: Ie43dcfafa3a82b9686194a7062371297dd7e052b