tree 6daf17d0d18dda32fc8d45e9c11ff4891e6e2318
parent 4090273bdffd050f2ec3037d88b32c656c3ccb8c
parent a13836febf45873c32ed2b458be8e004d285f9fb
author Miao Wang <miaowang@google.com> 1495574641 +0000
committer android-build-merger <android-build-merger@google.com> 1495574641 +0000

Protect static global access with a global flag. am: 93ad4e0192
am: a13836febf

Change-Id: I51cc24e4504a17f3b4b08927f672ba15faf050e2