summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add platform versions of the protobuf libraries."studio-1.5studio-1.4gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2gradle_1.3.0-beta1android-wear-5.0.0_r1Dan Albert2014-11-111-0/+37
|\
| * Add platform versions of the protobuf libraries.Dan Albert2014-11-111-0/+37
|/
* am dbb9c303: Merge "Added an API method in FieldData to allow access to the U...Behrooz Khorashadi2014-11-061-0/+17
|\
| * Merge "Added an API method in FieldData to allow access to the UnknownField d...Behrooz Khorashadi2014-11-061-0/+17
| |\
| | * Added an API method in FieldData to allow access to the UnknownField dataBehrooz Khorashadi2014-11-051-0/+17
| |/
* | am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-2927-10/+110
|\ \ | |/
| * Merge "Move protobuf 2.3.0 to prebuilts."Jeff Davidson2014-10-2827-10/+110
| |\
| | * Move protobuf 2.3.0 to prebuilts.Jeff Davidson2014-10-2227-10/+110
| |/
* | am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."Brian Duff2014-10-033-12/+31
|\ \ | |/
| * Merge "Change reftypes_primitive_enums to reftypes_compat_mode."android-l-preview_r2Brian Duff2014-10-023-12/+31
| |\
| | * Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| |/
* | am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
|\ \ | |/
| * Merge "Adds a primitive enum mode for reftypes."Brian Duff2014-10-014-4/+23
| |\
| | * Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| |/
* | am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in ha...Brian Duff2014-09-171-0/+1
|\ \ | |/
| * Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculat...Brian Duff2014-09-171-0/+1
| |\
| | * Includes a MessageNano subclass's name's hashCode in hashCode calculations.Jason Neufeld2014-09-161-0/+1
| |/
* | am c4e7b92f: Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
|\ \ | |/
| * Merge "Make the tag field public."Brian Duff2014-09-031-1/+1
| |\
| | * Make the tag field public.Brian Duff2014-09-021-1/+1
| |/
* | am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
|\ \ | |/
| * Merge "Add MessageNano.messageNanoEquals()."Brian Duff2014-09-022-0/+29
| |\
| | * Add MessageNano.messageNanoEquals().Brian Duff2014-09-022-0/+29
| |/
* | am 0068978c: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
|\ \ | |/
| * Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
| |\
| | * Fixed octal printing of bytearraysLinus Tufvesson2014-08-291-1/+1
| |/
* | am 77866143: Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-291-1/+1
|\ \ | |/
| * Merge "Revert "Fixed octal printing of bytearrays""Max Cai2014-08-281-1/+1
| |\
| | * Revert "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
* | | am 238e0ac5: Merge "Fixed octal printing of bytearrays"Max Cai2014-08-291-1/+1
|\ \ \ | |/ /
| * | Merge "Fixed octal printing of bytearrays"Max Cai2014-08-281-1/+1
| |\ \ | | |/
| | * Fixed octal printing of bytearraysLinus Tufvesson2014-08-281-1/+1
| |/
* | am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around ...Max Cai2014-08-210-0/+0
|\ \
| * \ am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldD...android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r2android-cts-5.1_r1android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1Max Cai2014-08-217-16/+36
| |\ \
| | * \ am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-217-16/+36
| | |\ \
* | | \ \ am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to e...Max Cai2014-08-210-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension valu...Max Cai2014-08-218-256/+920
| |\ \ \ \ | | |/ / /
| | * | | am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai2014-08-218-256/+920
| | |\ \ \
* | | \ \ \ am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT c...Ying Wang2014-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the glo...Ying Wang2014-08-210-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXP...Ying Wang2014-08-210-0/+0
| | |\ \ \ \
* | | \ \ \ \ am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history...Baligh Uddin2014-08-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset ...Baligh Uddin2014-08-210-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5...Baligh Uddin2014-08-210-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge comm...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a...Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-m...Wink Saville2014-08-210-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-co...Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"Wink Saville2014-08-210-0/+0
| | |\ \ \ \ \ \ \