am ecaf00e8: DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.
am ecaf00e8: DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.

Merge commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333' into eclair-plus-aosp

* commit 'ecaf00e88ffd15c8471b41e7349ab37a125c9333':
  DO NOT MERGE: Copy 4.xml to 5.xml to allow Eclair to diverge from Donut.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base