Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp * commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9': Fix compilation of add-resource tag.
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp * commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9': Fix compilation of add-resource tag.