summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava...android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1Wink Saville2013-08-081-2/+2
|\
| * Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."Wink Saville2013-08-081-2/+2
| |\
| | * Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.Wink Saville2013-08-071-2/+2
| |/
* | am e7b778b9: Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0827-497/+718
|\ \ | |/
| * Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0727-497/+718
| |\
| | * Fix outer classname for javamicro/javanano.Max Cai2013-08-0527-497/+718
* | | am 87c8e31b: Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
|\ \ \ | |/ /
| * | Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
| |\ \ | | |/ | |/|
| | * Fixed packed repeated serialization.Ulas Kirazci2013-07-313-30/+48
* | | am be47f55e: Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
|\ \ \ | |/ /
| * | Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
| |\ \ | | |/ | |/|
| | * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-2910-31/+273
| |/
* | am 021f8f1b: Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
|\ \ | |/
| * Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
| |\
| | * Add test for passing in proto params.Ulas Kirazci2013-07-252-1/+25
* | | am ac5a239e: Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2516-43/+230
|\ \ \ | |/ /
| * | Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2616-43/+230
| |\ \ | | |/ | |/|
| | * Per-file java_multiple_files flag.Max Cai2013-07-2516-43/+230
| |/
* | am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
|\ \ | |/
| * am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| |\
| | * Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| | |\
| | | * Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-237-8/+141
| | |/
* | | am f604f71a: am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
|\ \ \ | |/ /
| * | am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| |\ \ | | |/
| | * Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| | |\
| | | * Add contribution instructions for nano.Ulas Kirazci2013-07-191-0/+18
* | | | am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords prope...Ulas Kirazci2013-07-1910-11/+72
|\ \ \ \ | |/ / /
| * | | am aad4b307: Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| |\ \ \ | | |/ /
| | * | Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| | |\ \ | | | |/ | | |/|
| | | * Update nano to serialize java keywords properly.Tom Chao2013-07-1910-11/+72
| | |/
* | | Added micro/nano configurations to protobuf in gradle.Adam Metcalf2013-07-151-36/+36
* | | am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFro...Ulas Kirazci2013-07-113-4/+13
|\ \ \ | |/ /
| * | am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without cas...Ulas Kirazci2013-07-093-4/+13
| |\ \ | | |/
| | * Merge "Make it possible to use MessageNano.mergeFrom without casting."Ulas Kirazci2013-07-093-4/+13
| | |\
| | | * Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-083-4/+13
* | | | am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-112-0/+2
|\ \ \ \ | |/ / /
| * | | am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
| | |\ \
| | | * | Fix vanilla make build.Ulas Kirazci2013-07-092-0/+2
| | |/ /
* | | | am 08891725: am 728a8b78: Merge "Fix the build"Wink Saville2013-07-112-4/+14
|\ \ \ \ | |/ / /
| * | | am 728a8b78: Merge "Fix the build"Wink Saville2013-07-092-4/+14
| |\ \ \ | | |/ /
| | * | Merge "Fix the build"Wink Saville2013-07-092-4/+14
| | |\ \ | | | |/ | | |/|
| | | * Fix the buildEvan Charlton2013-07-092-4/+14
| | |/
* | | am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fiel...Wink Saville2013-06-2515-25/+812
|\ \ \ | |/ /
| * | am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
| |\ \ | | |/
| | * Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
| | |\
| | | * Nano support for extensions and unknown fields.Brian Duff2013-06-2415-25/+812
| | |/
* | | Gradle project file.Adam Metcalf2013-06-171-0/+51
|/ /
* | am 9459b5c4: Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
|\ \ | |/
| * Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
| |\