tree 6b57034537504e7b1d891ce7ead7b59a9c48afee
parent bbb76d513b55c032ee70325d29944165022de081
parent ce2b33231e306cf185a9d6795e8045ddfdab7cca
author Tianjie Xu <xunchang@google.com> 1561746987 -0700
committer android-build-merger <android-build-merger@google.com> 1561746987 -0700

Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed
am: ce2b33231e

Change-Id: I92a1cf77649c500169d052f7e3c7defd5f5bb16d