comment out image
before redoing xml
Merge branch 'android_lee' into android