hg: jdk9/hs/hotspot: 8174798: Mis-merge left serviceability/sa/TestCpoolForInvokeDynamic.java ignored

[david.holmes at oracle.com]

Changeset: 28888f4d8e05
Author:    dholmes
Date:      2017-02-12 20:21 -0500
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/28888f4d8e05

8174798: Mis-merge left serviceability/sa/TestCpoolForInvokeDynamic.java ignored
Reviewed-by: dcubed

! test/serviceability/sa/TestCpoolForInvokeDynamic.java