From: Scott Main Date: Tue, 23 Aug 2016 15:56:15 +0000 (+0000) Subject: Merge "add workaround for annotations dependency conflict with espresso" into nyc... X-Git-Tag: android-x86-7.1-r1~950^2~22 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ea21992e75a446c55587ca2b87e2a4c81381f09;p=android-x86%2Fframeworks-base.git Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: f8a0cb2964 Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34 --- 0ea21992e75a446c55587ca2b87e2a4c81381f09