OSDN Git Service

[automerger skipped] Merge "Disable iorap test mapping" am: 46b3d6d05d am: 27ee83dca3...
authorMathieu Chartier <mathieuc@google.com>
Mon, 22 Apr 2019 21:54:07 +0000 (14:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Apr 2019 21:54:07 +0000 (14:54 -0700)
am: fcfbc9c584 -s ours
am skip reason: change_id I17befa52ebad92413122253f692168cf93cbab6e with SHA1 6565a34d7f is in history

Change-Id: I1bdcb157715f7e18f81e528990288d07be1c451b


Trivial merge