tree 6b57034537504e7b1d891ce7ead7b59a9c48afee
parent 165fd3916e3a1b67d09028d4c185f7789afd4f0b
parent 143b1d9aed6daccb56f21b35bf8091e6f3ecd5c8
author Tianjie Xu <xunchang@google.com> 1561746566 -0700
committer android-build-merger <android-build-merger@google.com> 1561746566 -0700

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

Change-Id: I8e77038c2b51751f6b2670aeb898d621a3d4a519