tree fdf3d363b3426e7bc0bda300ee7e527672fe67b9
parent 1e3118b2154b477481c2f100d1ce1c45f99c921c
author calderwoodra <calderwoodra@google.com> 1504133600 -0700
committer Eric Erfanian <erfanian@google.com> 1504144528 -0700

Fix AOSP issue with static imports.

Test: manual
PiperOrigin-RevId: 167062499
Change-Id: I795c0f47e88c0bee9921af8d12cac90424e094b5