tree e831c936795250d189aa17871c9fe3c668133fe5
parent 3183470221f88a7171c62eb001a5fb2dad3cc6e4
parent b0828d55e5a738a9300f73da366aba0846a4ea10
author Chenjie Yu <cjyu@google.com> 1525828501 -0700
committer android-build-merger <android-build-merger@google.com> 1525828501 -0700

Merge "fix cts error on x86 simulator" into pi-dev am: 9743fae2d9
am: b0828d55e5

Change-Id: Id25dc7960e984e99328fcbbdc729c29021677e3e