Merge change I95a34d28 into eclair

* changes:
  ADT XML String Refactoring: fix refusing to edit @+id/blah.