OSDN Git Service

am a640fb4f: Fix the build. A "--" token is not just text in an XML comment.
authorEric Fischer <enf@google.com>
Fri, 22 Oct 2010 01:22:09 +0000 (18:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 01:22:09 +0000 (18:22 -0700)
commit92acdba01c6593b9353d3e18ae16920794e99d23
tree9e14d9cbcd0c33215c773a5e63b3842b041f710f
parentd2927990ffe0d8ac385e16a38c189ace00065cff
parenta640fb4f97ee5e317ed51bd585c892d465b3da38
am a640fb4f: 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.
res/values/strings.xml