Attached is that output from the "build" project. ---- Tom Palarz Security Consultant Neohapsis, Inc. 773-269-6300 x301 312-231-9834 m 773-394-8314 f [email protected]
www.neohapsis.com The contents of this transmitted message are confidential and may be subject to privilege. Disclosure, copying, distribution, or use of the contents of this transmission or information it contains is prohibited if you have received this transmission in error. If you are not the named recipient, please immediately notify the sender and destroy all copies you have received. -----Original Message----- From: Stephen Smalley [mailto:[email protected]] Sent: Tuesday, April 09, 2013 2:01 PM To: Tom Palarz Cc: [email protected] Subject: Re: Seandroid 4.2.2 release repo sync error - bad merge? git stash show will show you what was stashed. On 04/09/2013 02:44 PM, Tom Palarz wrote: > Since the repo forall git stash worked, and most likely removed most remnants > that would have been useful in debugging this, I'll need to try from the > beginning to reproduce this. Will re-post once I do, but I needed to get > something working quickly and that seems to have worked. > > ---- > Tom Palarz > Security Consultant > Neohapsis, Inc. > 773-269-6300 x301 > 312-231-9834 m > 773-394-8314 f > [email protected] > > www.neohapsis.com > > The contents of this transmitted message are confidential and may be subject > to privilege. Disclosure, copying, distribution, or use of the contents of > this transmission or information it contains is prohibited if you have > received this transmission in error. If you are not the named recipient, > please immediately notify the sender and destroy all copies you have received. > > -----Original Message----- > From: Stephen Smalley [mailto:[email protected]] > Sent: Tuesday, April 09, 2013 11:26 AM > To: Tom Palarz > Cc: [email protected] > Subject: Re: Seandroid 4.2.2 release repo sync error - bad merge? > > On 04/09/2013 10:34 AM, Tom Palarz wrote: >> Repo sync –d resulted in the same errors. Repo forall git –c stash and then >> repo sync did seem to do the checkouts appropriately. My suspicion is still >> make clobber. There, of course, is definitely the possibility that a >> fat-finger was involved somewhere, too, though. > > So cd to one of the offending projects, e.g. build, and run git stash show to > see what exactly was modified. > > I couldn't reproduce it here. > > > > > > -- > This message was distributed to subscribers of the seandroid-list mailing > list. > If you no longer wish to subscribe, send mail to > [email protected] with the words "unsubscribe seandroid-list" without > quotes as the message. >
target/product/security/media.pk8 | Bin 1216 -> 1216 bytes target/product/security/platform.pk8 | Bin 1216 -> 1216 bytes target/product/security/shared.pk8 | Bin 1218 -> 1218 bytes target/product/security/testkey.pk8 | Bin 1217 -> 1217 bytes .../assets/images/android-developers-logo.png | Bin 3195 -> 3195 bytes .../templates-ds/assets/images/android_wrench.png | Bin 3633 -> 3633 bytes .../assets/images/arrow-left-develop.png | Bin 3036 -> 3036 bytes .../templates-ds/assets/images/arrow-left.png | Bin 3144 -> 3144 bytes .../assets/images/arrow-right-develop.png | Bin 2960 -> 2960 bytes .../templates-ds/assets/images/arrow-right.png | Bin 2757 -> 2757 bytes .../templates-ds/assets/images/arrows-up-down.png | Bin 162 -> 162 bytes .../templates-ds/assets/images/bg_gradient.jpg | Bin 1376 -> 1376 bytes .../templates-ds/assets/images/blog-default.png | Bin 72570 -> 72570 bytes .../assets/images/body-gradient-tab.png | Bin 192 -> 192 bytes .../droiddoc/templates-ds/assets/images/close.png | Bin 312 -> 312 bytes .../templates-ds/assets/images/dac_logo.png | Bin 2170 -> 2170 bytes .../templates-ds/assets/images/fullscreen.png | Bin 1154 -> 1154 bytes .../templates-ds/assets/images/grad-rule-qv.png | Bin 249 -> 249 bytes .../assets/images/home/Android_Dev_Lab_l.png | Bin 16512 -> 16512 bytes .../templates-ds/assets/images/home/GDC2011.png | Bin 15892 -> 15892 bytes .../assets/images/home/GTV_icon_large.png | Bin 7553 -> 7553 bytes .../assets/images/home/GTV_icon_small.png | Bin 3576 -> 3576 bytes .../assets/images/home/IO-logo-2011.png | Bin 11210 -> 11210 bytes .../templates-ds/assets/images/home/IO-logo.png | Bin 3673 -> 3673 bytes .../templates-ds/assets/images/home/adc2_l.png | Bin 111790 -> 111790 bytes .../templates-ds/assets/images/home/adc2_s.png | Bin 27250 -> 27250 bytes .../assets/images/home/android_adc.png | Bin 1849 -> 1849 bytes .../assets/images/home/devphone-large.png | Bin 16630 -> 16630 bytes .../assets/images/home/devphone-small.png | Bin 1944 -> 1944 bytes .../assets/images/home/eclair-android.png | Bin 11311 -> 11311 bytes .../assets/images/home/froyo-android.png | Bin 17086 -> 17086 bytes .../templates-ds/assets/images/home/gdc-logo.png | Bin 2739 -> 2739 bytes .../assets/images/home/gingerdroid.png | Bin 11690 -> 11690 bytes .../assets/images/home/google-plus-small.png | Bin 5042 -> 5042 bytes .../assets/images/home/google-plus.png | Bin 21315 -> 21315 bytes .../assets/images/home/honeycomb-android.png | Bin 13716 -> 13716 bytes .../templates-ds/assets/images/home/icon-about.png | Bin 5573 -> 5573 bytes .../assets/images/home/icon-design.png | Bin 5739 -> 5739 bytes .../assets/images/home/icon-develop.png | Bin 5364 -> 5364 bytes .../assets/images/home/icon-distribute.png | Bin 4588 -> 4588 bytes .../assets/images/home/ics-android.png | Bin 15002 -> 15002 bytes .../templates-ds/assets/images/home/maps-large.png | Bin 39756 -> 39756 bytes .../templates-ds/assets/images/home/maps-small.png | Bin 3424 -> 3424 bytes .../assets/images/home/market-large.png | Bin 5752 -> 5752 bytes .../assets/images/home/market-small.png | Bin 3134 -> 3134 bytes .../templates-ds/assets/images/home/sdk-large.png | Bin 1616 -> 1616 bytes .../templates-ds/assets/images/home/sdk-small.png | Bin 2381 -> 2381 bytes .../templates-ds/assets/images/icon_design.png | Bin 697 -> 697 bytes .../assets/images/icon_guidelines_logo.png | Bin 44163 -> 44163 bytes .../templates-ds/assets/images/icon_market.jpg | Bin 1022 -> 1022 bytes .../templates-ds/assets/images/icon_more.png | Bin 1098 -> 1098 bytes .../templates-ds/assets/images/icon_play.png | Bin 10201 -> 10201 bytes .../templates-ds/assets/images/icon_search.png | Bin 1406 -> 1406 bytes .../droiddoc/templates-ds/assets/images/locale.png | Bin 393 -> 393 bytes .../templates-ds/assets/images/more_bottom.png | Bin 1055 -> 1055 bytes .../templates-ds/assets/images/more_check.png | Bin 1014 -> 1014 bytes .../templates-ds/assets/images/more_mid.png | Bin 958 -> 958 bytes .../templates-ds/assets/images/more_top.png | Bin 1447 -> 1447 bytes .../templates-ds/assets/images/preliminary.png | Bin 2251 -> 2251 bytes .../templates-ds/assets/images/quicknav_arrow.png | Bin 2951 -> 2951 bytes .../templates-ds/assets/images/quicknav_btn_bg.png | Bin 1024 -> 1024 bytes .../templates-ds/assets/images/resizable-s2.png | Bin 966 -> 966 bytes .../assets/images/resource-article.png | Bin 889 -> 889 bytes .../assets/images/resource-big-article.png | Bin 2095 -> 2095 bytes .../assets/images/resource-big-sample.png | Bin 2480 -> 2480 bytes .../assets/images/resource-big-tutorial.png | Bin 2544 -> 2544 bytes .../assets/images/resource-big-video.png | Bin 2155 -> 2155 bytes .../templates-ds/assets/images/resource-sample.png | Bin 972 -> 972 bytes .../assets/images/resource-tutorial.png | Bin 1001 -> 1001 bytes .../templates-ds/assets/images/resource-video.png | Bin 835 -> 835 bytes .../templates-ds/assets/images/sidenav-rule.png | Bin 258 -> 258 bytes .../templates-ds/assets/images/styles/callout.png | Bin 1383 -> 1383 bytes .../device_galaxynexus_blank_land_span13.png | Bin 64431 -> 64431 bytes .../styles/device_galaxynexus_blank_land_span8.png | Bin 30679 -> 30679 bytes .../styles/device_galaxynexus_blank_port_span5.png | Bin 39994 -> 39994 bytes .../styles/device_galaxynexus_blank_port_span9.png | Bin 75920 -> 75920 bytes .../assets/images/styles/disclosure_down.png | Bin 238 -> 238 bytes .../assets/images/styles/disclosure_left.png | Bin 229 -> 229 bytes .../assets/images/styles/disclosure_right.png | Bin 228 -> 228 bytes .../assets/images/styles/disclosure_up.png | Bin 221 -> 221 bytes .../templates-ds/assets/images/styles/gototop.png | Bin 262 -> 262 bytes .../assets/images/styles/ico_action.png | Bin 415 -> 415 bytes .../templates-ds/assets/images/styles/ico_good.png | Bin 318 -> 318 bytes .../assets/images/styles/ico_movie_inline.png | Bin 1040 -> 1040 bytes .../assets/images/styles/ico_phone_tablet.png | Bin 302 -> 302 bytes .../templates-ds/assets/images/styles/ico_use.png | Bin 437 -> 437 bytes .../templates-ds/assets/images/styles/ico_web.png | Bin 1037 -> 1037 bytes .../assets/images/styles/ico_wrong.png | Bin 286 -> 286 bytes .../assets/images/styles/open_new_page.png | Bin 980 -> 980 bytes .../assets/images/triangle-closed-small.png | Bin 166 -> 166 bytes .../templates-ds/assets/images/triangle-closed.png | Bin 3565 -> 3565 bytes .../assets/images/triangle-opened-small.png | Bin 170 -> 170 bytes .../templates-ds/assets/images/triangle-opened.png | Bin 3567 -> 3567 bytes .../templates-ds/assets/images/uiguidelines1.png | Bin 5258 -> 5258 bytes .../templates-ds/assets/images/video-droid.png | Bin 1614 -> 1614 bytes tools/droiddoc/templates-ds/assets/jdiff_logo.gif | Bin 390 -> 390 bytes .../droiddoc/templates-ds/assets/triangle-none.gif | Bin 240 -> 240 bytes tools/droiddoc/templates-pdk/assets/favicon.ico | Bin 1150 -> 1150 bytes .../assets/images/android-developers-logo.png | Bin 3195 -> 3195 bytes .../templates-pdk/assets/images/android_wrench.png | Bin 3633 -> 3633 bytes .../assets/images/body-gradient-tab.png | Bin 192 -> 192 bytes .../templates-pdk/assets/images/grad-rule-qv.png | Bin 249 -> 249 bytes .../assets/images/home/Android_Dev_Lab_l.png | Bin 13256 -> 13256 bytes .../templates-pdk/assets/images/home/IO-logo.png | Bin 3673 -> 3673 bytes .../templates-pdk/assets/images/home/adc2_l.png | Bin 2394 -> 2394 bytes .../templates-pdk/assets/images/home/adc2_s.png | Bin 671 -> 671 bytes .../assets/images/home/android_adc.png | Bin 1849 -> 1849 bytes .../assets/images/home/eclair-android.png | Bin 11311 -> 11311 bytes .../assets/images/home/froyo-android.png | Bin 16216 -> 16216 bytes .../templates-pdk/assets/images/home/gdc-logo.png | Bin 1907 -> 1907 bytes .../assets/images/home/maps-large.png | Bin 39756 -> 39756 bytes .../assets/images/home/maps-small.png | Bin 3424 -> 3424 bytes .../assets/images/home/market-large.png | Bin 5752 -> 5752 bytes .../assets/images/home/market-small.png | Bin 3134 -> 3134 bytes .../templates-pdk/assets/images/home/sdk-large.png | Bin 1616 -> 1616 bytes .../templates-pdk/assets/images/home/sdk-small.png | Bin 2381 -> 2381 bytes .../assets/images/icon_guidelines_logo.png | Bin 44163 -> 44163 bytes .../templates-pdk/assets/images/preliminary.png | Bin 2251 -> 2251 bytes .../templates-pdk/assets/images/rebox-gradient.gif | Bin 848 -> 848 bytes .../templates-pdk/assets/images/sidenav-rule.png | Bin 258 -> 258 bytes .../assets/images/triangle-closed-small.png | Bin 166 -> 166 bytes .../assets/images/triangle-closed.png | Bin 3614 -> 3614 bytes .../assets/images/triangle-opened-small.png | Bin 170 -> 170 bytes .../assets/images/triangle-opened.png | Bin 3612 -> 3612 bytes .../templates-pdk/assets/images/uiguidelines1.png | Bin 5258 -> 5258 bytes .../templates-pdk/assets/images/video-droid.png | Bin 1614 -> 1614 bytes tools/droiddoc/templates-pdk/assets/jdiff_logo.gif | Bin 390 -> 390 bytes .../templates-pdk/assets/triangle-none.gif | Bin 240 -> 240 bytes .../assets/images/android-developers-logo.png | Bin 3195 -> 3195 bytes .../templates-sdk/assets/images/android_wrench.png | Bin 3633 -> 3633 bytes .../assets/images/arrow-left-develop.png | Bin 3036 -> 3036 bytes .../templates-sdk/assets/images/arrow-left.png | Bin 3144 -> 3144 bytes .../assets/images/arrow-right-develop.png | Bin 2960 -> 2960 bytes .../templates-sdk/assets/images/arrow-right.png | Bin 2757 -> 2757 bytes .../templates-sdk/assets/images/arrows-up-down.png | Bin 162 -> 162 bytes .../templates-sdk/assets/images/bg_gradient.jpg | Bin 1376 -> 1376 bytes .../templates-sdk/assets/images/blog-default.png | Bin 72570 -> 72570 bytes .../assets/images/body-gradient-tab.png | Bin 192 -> 192 bytes .../droiddoc/templates-sdk/assets/images/close.png | Bin 312 -> 312 bytes .../templates-sdk/assets/images/dac_logo.png | Bin 2170 -> 2170 bytes .../templates-sdk/assets/images/fullscreen.png | Bin 1154 -> 1154 bytes .../templates-sdk/assets/images/grad-rule-qv.png | Bin 249 -> 249 bytes .../assets/images/home/Android_Dev_Lab_l.png | Bin 16512 -> 16512 bytes .../templates-sdk/assets/images/home/GDC2011.png | Bin 15892 -> 15892 bytes .../assets/images/home/GTV_icon_large.png | Bin 7553 -> 7553 bytes .../assets/images/home/GTV_icon_small.png | Bin 3576 -> 3576 bytes .../assets/images/home/IO-logo-2011.png | Bin 11210 -> 11210 bytes .../templates-sdk/assets/images/home/IO-logo.png | Bin 3673 -> 3673 bytes .../templates-sdk/assets/images/home/adc2_l.png | Bin 111790 -> 111790 bytes .../templates-sdk/assets/images/home/adc2_s.png | Bin 27250 -> 27250 bytes .../assets/images/home/android_adc.png | Bin 1849 -> 1849 bytes .../assets/images/home/devphone-large.png | Bin 16630 -> 16630 bytes .../assets/images/home/devphone-small.png | Bin 1944 -> 1944 bytes .../assets/images/home/eclair-android.png | Bin 11311 -> 11311 bytes .../assets/images/home/froyo-android.png | Bin 17086 -> 17086 bytes .../templates-sdk/assets/images/home/gdc-logo.png | Bin 2739 -> 2739 bytes .../assets/images/home/gingerdroid.png | Bin 11690 -> 11690 bytes .../assets/images/home/google-plus-small.png | Bin 5042 -> 5042 bytes .../assets/images/home/google-plus.png | Bin 21315 -> 21315 bytes .../assets/images/home/honeycomb-android.png | Bin 13716 -> 13716 bytes .../assets/images/home/icon-about.png | Bin 5573 -> 5573 bytes .../assets/images/home/icon-design.png | Bin 5739 -> 5739 bytes .../assets/images/home/icon-develop.png | Bin 5364 -> 5364 bytes .../assets/images/home/icon-distribute.png | Bin 4588 -> 4588 bytes .../assets/images/home/ics-android.png | Bin 15002 -> 15002 bytes .../assets/images/home/maps-large.png | Bin 39756 -> 39756 bytes .../assets/images/home/maps-small.png | Bin 3424 -> 3424 bytes .../assets/images/home/market-large.png | Bin 5752 -> 5752 bytes .../assets/images/home/market-small.png | Bin 3134 -> 3134 bytes .../templates-sdk/assets/images/home/sdk-large.png | Bin 1616 -> 1616 bytes .../templates-sdk/assets/images/home/sdk-small.png | Bin 2381 -> 2381 bytes .../templates-sdk/assets/images/icon_design.png | Bin 697 -> 697 bytes .../assets/images/icon_guidelines_logo.png | Bin 44163 -> 44163 bytes .../templates-sdk/assets/images/icon_market.jpg | Bin 1022 -> 1022 bytes .../templates-sdk/assets/images/icon_more.png | Bin 1098 -> 1098 bytes .../templates-sdk/assets/images/icon_play.png | Bin 10201 -> 10201 bytes .../templates-sdk/assets/images/icon_search.png | Bin 1406 -> 1406 bytes .../templates-sdk/assets/images/locale.png | Bin 393 -> 393 bytes .../templates-sdk/assets/images/more_bottom.png | Bin 1055 -> 1055 bytes .../templates-sdk/assets/images/more_check.png | Bin 1014 -> 1014 bytes .../templates-sdk/assets/images/more_mid.png | Bin 958 -> 958 bytes .../templates-sdk/assets/images/more_top.png | Bin 1447 -> 1447 bytes .../templates-sdk/assets/images/preliminary.png | Bin 2251 -> 2251 bytes .../templates-sdk/assets/images/quicknav_arrow.png | Bin 2951 -> 2951 bytes .../assets/images/quicknav_btn_bg.png | Bin 1024 -> 1024 bytes .../templates-sdk/assets/images/resizable-s2.png | Bin 966 -> 966 bytes .../assets/images/resource-article.png | Bin 889 -> 889 bytes .../assets/images/resource-big-article.png | Bin 2095 -> 2095 bytes .../assets/images/resource-big-sample.png | Bin 2480 -> 2480 bytes .../assets/images/resource-big-tutorial.png | Bin 2544 -> 2544 bytes .../assets/images/resource-big-video.png | Bin 2155 -> 2155 bytes .../assets/images/resource-sample.png | Bin 972 -> 972 bytes .../assets/images/resource-tutorial.png | Bin 1001 -> 1001 bytes .../templates-sdk/assets/images/resource-video.png | Bin 835 -> 835 bytes .../templates-sdk/assets/images/sidenav-rule.png | Bin 258 -> 258 bytes .../templates-sdk/assets/images/styles/callout.png | Bin 1383 -> 1383 bytes .../device_galaxynexus_blank_land_span13.png | Bin 64431 -> 64431 bytes .../styles/device_galaxynexus_blank_land_span8.png | Bin 30679 -> 30679 bytes .../styles/device_galaxynexus_blank_port_span5.png | Bin 39994 -> 39994 bytes .../styles/device_galaxynexus_blank_port_span9.png | Bin 75920 -> 75920 bytes .../assets/images/styles/disclosure_down.png | Bin 238 -> 238 bytes .../assets/images/styles/disclosure_left.png | Bin 229 -> 229 bytes .../assets/images/styles/disclosure_right.png | Bin 228 -> 228 bytes .../assets/images/styles/disclosure_up.png | Bin 221 -> 221 bytes .../templates-sdk/assets/images/styles/gototop.png | Bin 262 -> 262 bytes .../assets/images/styles/ico_action.png | Bin 415 -> 415 bytes .../assets/images/styles/ico_good.png | Bin 318 -> 318 bytes .../assets/images/styles/ico_movie_inline.png | Bin 1040 -> 1040 bytes .../assets/images/styles/ico_phone_tablet.png | Bin 302 -> 302 bytes .../templates-sdk/assets/images/styles/ico_use.png | Bin 437 -> 437 bytes .../templates-sdk/assets/images/styles/ico_web.png | Bin 1037 -> 1037 bytes .../assets/images/styles/ico_wrong.png | Bin 286 -> 286 bytes .../assets/images/styles/open_new_page.png | Bin 980 -> 980 bytes .../assets/images/triangle-closed-small.png | Bin 166 -> 166 bytes .../assets/images/triangle-closed.png | Bin 3565 -> 3565 bytes .../assets/images/triangle-opened-small.png | Bin 170 -> 170 bytes .../assets/images/triangle-opened.png | Bin 3567 -> 3567 bytes .../templates-sdk/assets/images/uiguidelines1.png | Bin 5258 -> 5258 bytes .../templates-sdk/assets/images/video-droid.png | Bin 1614 -> 1614 bytes 219 files changed, 0 insertions(+), 0 deletions(-)
