tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent 605cb756f865d39ec84aa29798d3cb76a299bb4a
parent d50f8399fa7933949c7137c461de9bbed7ca6fcd
author Irfan Sheriff <isheriff@google.com> 1274904251 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274904251 -0700

am 9ecca85f: Merge "Fix escaping of characters" into froyo

Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp

* commit '9ecca85f0613032590c6840cae48b54f3d626181':
  Fix escaping of characters