OSDN Git Service

am 214e2855: am 5dde0c4d: Merge "Adding support for hash \'#\' comments to our JSON...
authorJesse Wilson <jessewilson@google.com>
Thu, 8 Apr 2010 17:40:43 +0000 (10:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Apr 2010 17:40:43 +0000 (10:40 -0700)
commit9eb7613b7f5d8e2bce06ba50c2f04b538919e6f5
tree152e5849c0a10d72029d0b62b45842eaa1ebcdc0
parent0865a69d60da0c2ce8cbd2b4d93ef4deda39200c
parent214e285536e18e762c3207fecf97dacdd22e472e
am 214e2855: am 5dde0c4d: Merge "Adding support for hash \'#\' comments to our JSON parser." into froyo

Merge commit '214e285536e18e762c3207fecf97dacdd22e472e' into dalvik-dev

* commit '214e285536e18e762c3207fecf97dacdd22e472e':
  Adding support for hash '#' comments to our JSON parser.