tree dea464ffe5d5fa49d65ce2e81e9c88f676733ca0
parent 48851371793d7618a8333b643174e14c9f92bc9b
parent 968e41783da70313e0379abe79b7bbb2af1e6a31
author Hall Liu <hallliu@google.com> 1559249765 -0700
committer android-build-merger <android-build-merger@google.com> 1559249765 -0700

Fix unit tests
am: 968e41783d

Change-Id: I24201de4fdd107ecfb9b85e896312341b98ee0f3