external_protobuf.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXP...	Ying Wang	2014-08-21	0	-0/+0
\|\
\| *	am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT	Ying Wang	2014-05-21	0	-0/+0
\| \|\
* \| \	am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5...	Baligh Uddin	2014-08-21	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73...	Baligh Uddin	2014-05-21	0	-0/+0
\| \|\ \
* \| \ \	am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-m...	Wink Saville	2014-08-21	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict...	Wink Saville	2014-05-08	0	-0/+0
\| \|\ \ \
* \| \ \ \	am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"	Wink Saville	2014-08-21	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Merge commit 'e887563a' into fix-merge-conclict"	Wink Saville	2014-05-07	2	-4/+39
* \| \| \| \|	am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42:...	Jan-Willem Maarse	2014-08-21	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix N...	Jan-Willem Maarse	2014-05-07	0	-0/+0
\| \|\ \ \ \
* \| \ \ \ \	am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit...	Bill Yi	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bda...	Bill Yi	2014-05-07	0	-0/+0
\| \|\ \ \ \ \
* \| \ \ \ \ \	am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b60...	Jeff Davidson	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master	Jeff Davidson	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ...	Max Cai	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_serv...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'...	Max Cai	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cache...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \	am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Rever...	Wink Saville	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t res...	Wink Saville	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \	am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict	Wink Saville	2014-08-21	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge commit 'f65ee555' into fix-merge-conflict	Wink Saville	2014-05-07	2	-39/+4
\| \|\ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \	am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'...	Wink Saville	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cache...	Wink Saville	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \	am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix c...	Wink Saville	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error ...	Wink Saville	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \	am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Exten...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \	am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge change...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-mod...	Jie Dai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus...	Jie Dai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace i...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Corre...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: float...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize r...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix M...	Andrew Flynn	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPri...	Andrew Flynn	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initia...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano:...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t gener...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit...	The Android Open Source Project	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d78...	The Android Open Source Project	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit...	The Android Open Source Project	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f37...	The Android Open Source Project	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align...	Max Cai	2014-08-20	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: t...	Max Cai	2014-05-07	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \