OSDN Git Service

Merge "fix cts error on x86 simulator" into pi-dev
authorChenjie Yu <cjyu@google.com>
Wed, 9 May 2018 01:07:57 +0000 (18:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 01:07:57 +0000 (18:07 -0700)
commitb0828d55e5a738a9300f73da366aba0846a4ea10
treecc314ad9a87feda4f498d74c78d8a912f42db37f
parent30b2280bbe2477beff256906b8c1c975cbad1b14
parent9743fae2d97909f83e9f3a1338f7811bce95f120
Merge "fix cts error on x86 simulator" into pi-dev
am: 9743fae2d9

Change-Id: I13f5120724b6983661bd29f93112c66c4bce0f3d