tree bb6c3653a3c7284df938a19199f1b9008de58427
parent d5eaa706ece97f280aaaeb9d1f0fccaceedc809b
parent e2eabf01d64791bf160a6be87fbfa922ce357370
author Hall Liu <hallliu@google.com> 1559250391 -0700
committer android-build-merger <android-build-merger@google.com> 1559250391 -0700

Fix unit tests am: 968e41783d
am: e2eabf01d6

Change-Id: Ia9ad0bd3fa99986d27cb45b23e0bedb38246f21b