am c0446aa9: Merge change I4d2a57bc into eclair-mr2

Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp

* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
  Moved values into attributes of xml elements where they belong