summaryrefslogtreecommitdiffstats
path: root/base/json
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-085-16/+19
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-145-72/+72
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-251-6/+6
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-197-59/+56
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Merge Chromium src@r53293Ben Murdoch2010-08-046-59/+160
| | | | Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
* Initial source checkin.Patrick Scott2010-02-049-0/+1968
The source files were determined by building net_unittests in chromium's source tree. Some of the obvious libraries were left out (v8, gmock, gtest). The Android.mk file has all the sources (minus unittests and tools) that were used during net_unittests compilation. Nothing builds yet because of STL but that is the next task. The .cpp files will most likely not compile anyways because of the LOCAL_CPP_EXTENSION mod. I will have to break this into multiple projects to get around that limitation.