From e6f30eec368c28fca564a02c21f657a759320f4f Mon Sep 17 00:00:00 2001 From: Jerome Gaillard Date: Mon, 14 Nov 2016 17:11:38 +0000 Subject: [PATCH] Fix testActivity on buildbot Follow-up to commit 896cc3a794, the class file also needed to be updated. The golden file of testActivity is also updated to be the one built with jdk1.8.0_60 which is the one running on buildbot. Test: Run testActivity Change-Id: I7f3cfc1123160005c3cb5fa4213db6ae3a48457d (cherry picked from commit aab13aee9a11c340952c24f2410940df59996816) --- .../test/myapplication/CustomCalendar.class | Bin 1174 -> 1174 bytes .../testApp/MyApplication/golden/activity.png | Bin 6017 -> 6077 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/CustomCalendar.class b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/build/intermediates/classes/debug/com/android/layoutlib/test/myapplication/CustomCalendar.class index c3630552c7feb5fc2d1d11bc1d1d3168ee6e188e..dd7999857f5ac70f05230e2aea713551fa821ef1 100644 GIT binary patch delta 14 VcmbQnIgN9I2J`ozR~xmnSpX=Y1$Y1e delta 14 VcmbQnIgN9I2J_c`$Bo+AEC4361quKF diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/activity.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/activity.png index 7b58539f41d8acbb0fe2f5d601e6c3202fd0ffd2..f274dbfbbdd62af17c262aa1738850380c8b9ff7 100644 GIT binary patch literal 6077 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 iOaG}FIH88qvp4upyc+i