Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp * commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38': Fix the build. A "--" token is not just text in an XML comment.
Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp * commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38': Fix the build. A "--" token is not just text in an XML comment.