libcore.git - libcore

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of f9a3c05f to stage-aosp-master	Ian Rogers	2014-11-05	20	-49/+46
\|\
\| *	Merge "Move from UniquePtr to std::unique_ptr."	Ian Rogers	2014-11-05	20	-49/+46
\| \|\
\| \| *	Move from UniquePtr to std::unique_ptr.	Ian Rogers	2014-11-04	20	-49/+46
* \| \|	am d4d881ff: Merge "SSLSocket: track update to TLS defaults"	Kenny Root	2014-11-04	1	-6/+8
\|\ \ \ \| \|/ /
\| * \|	Merge "SSLSocket: track update to TLS defaults"	Kenny Root	2014-11-04	1	-6/+8
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	SSLSocket: track update to TLS defaults	Kenny Root	2014-11-03	1	-6/+8
* \| \|	am ef4d1341: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN."	Ian Rogers	2014-11-04	1	-7/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Don't define DISALLOW_COPY_AND_ASSIGN."	Ian Rogers	2014-11-04	1	-7/+0
\| \|\ \
\| \| * \|	Don't define DISALLOW_COPY_AND_ASSIGN.	Ian Rogers	2014-11-04	1	-7/+0
\| \|/ /
* \| \|	am 2b32e9ac: Merge "Use equals for comparing percent strings."	Narayan Kamath	2014-11-04	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Use equals for comparing percent strings."	Narayan Kamath	2014-11-04	1	-1/+1
\| \|\ \
\| \| * \|	Use equals for comparing percent strings.	Narayan Kamath	2014-11-04	1	-1/+1
\| \|/ /
* \| \|	am 140f3a33: Merge "SSLSocket: document current behavior with SSLContext"	Kenny Root	2014-11-04	2	-0/+71
\|\ \ \ \| \|/ /
\| * \|	Merge "SSLSocket: document current behavior with SSLContext"	Kenny Root	2014-11-03	2	-0/+71
\| \|\ \ \| \| \|/
\| \| *	SSLSocket: document current behavior with SSLContext	Kenny Root	2014-11-03	2	-0/+71
\| \|/
* \|	am 1cb912c5: Merge "Disable tzdata in ."	Elliott Hughes	2014-10-29	1	-2/+1
\|\ \ \| \|/
\| *	Merge "Disable tzdata in $ANDROID_DATA."	Elliott Hughes	2014-10-28	1	-2/+1
\| \|\
\| \| *	Disable tzdata in $ANDROID_DATA.	Elliott Hughes	2014-10-28	1	-2/+1
\| \|/
* \|	am bb23450e: Merge "Allow "_" in URIs."	Narayan Kamath	2014-10-29	2	-3/+10
\|\ \ \| \|/
\| *	Merge "Allow "_" in URIs."	Narayan Kamath	2014-10-28	2	-3/+10
\| \|\
\| \| *	Allow "_" in URIs.	Narayan Kamath	2014-10-28	2	-3/+10
\| \|/
* \|	am f7ba96dc: Merge "Improve DexFile debugging"	Brian Carlstrom	2014-10-29	1	-2/+6
\|\ \ \| \|/
\| *	Merge "Improve DexFile debugging"	Brian Carlstrom	2014-10-28	1	-2/+6
\| \|\
\| \| *	Improve DexFile debugging	Brian Carlstrom	2014-10-27	1	-2/+6
\| \|/
* \|	am be4e0fd0: Merge "Allow 1 ulp difference in test_cbrt_D and test_sinh_D."	Elliott Hughes	2014-10-28	1	-54/+30
\|\ \ \| \|/
\| *	Merge "Allow 1 ulp difference in test_cbrt_D and test_sinh_D."	Elliott Hughes	2014-10-27	1	-54/+30
\| \|\
\| \| *	Allow 1 ulp difference in test_cbrt_D and test_sinh_D.	Elliott Hughes	2014-10-25	1	-54/+30
* \| \|	am cf6718b6: Merge "Update tests for HttpURLConnection.disconnect() changes"	Neil Fuller	2014-10-28	2	-9/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Update tests for HttpURLConnection.disconnect() changes"	Neil Fuller	2014-10-27	2	-9/+13
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Update tests for HttpURLConnection.disconnect() changes	Neil Fuller	2014-10-24	2	-9/+13
* \| \|	am 64c8a4f4: Merge "Regression test for sl date format consistency."	Elliott Hughes	2014-10-28	1	-0/+7
\|\ \ \ \| \|/ /
\| * \|	Merge "Regression test for sl date format consistency."	Elliott Hughes	2014-10-24	1	-0/+7
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Regression test for sl date format consistency.	Elliott Hughes	2014-10-24	1	-0/+7
* \| \|	am ab385d6e: Merge "Fix javadoc links for property related methods."	Narayan Kamath	2014-10-28	1	-3/+3
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix javadoc links for property related methods."	Narayan Kamath	2014-10-24	1	-3/+3
\| \|\ \
\| \| * \|	Fix javadoc links for property related methods.	Narayan Kamath	2014-10-24	1	-3/+3
\| \|/ /
* \| \|	am 489419ff: Merge "Add an additional regression test for SSLSocketTest."	Neil Fuller	2014-10-28	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Add an additional regression test for SSLSocketTest."	Neil Fuller	2014-10-24	1	-0/+38
\| \|\ \
\| \| * \|	Add an additional regression test for SSLSocketTest.	Neil Fuller	2014-10-23	1	-0/+38
* \| \| \|	am ed744323: Merge "Changes to support TLS fallback SCSV"	Neil Fuller	2014-10-28	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Changes to support TLS fallback SCSV"	Neil Fuller	2014-10-24	1	-6/+220
\| \|\ \ \ \| \| \|/ / \| \| \| / \| \| \|/ \| \|/\|
\| \| *	Changes to support TLS fallback SCSV	Neil Fuller	2014-10-22	1	-6/+220
* \| \|	am d2ad744e: Merge "Fix LocaleDataTest build breakage."	Elliott Hughes	2014-10-28	1	-5/+5
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix LocaleDataTest build breakage."	Elliott Hughes	2014-10-23	1	-5/+5
\| \|\ \
\| \| * \|	Fix LocaleDataTest build breakage.	Elliott Hughes	2014-10-23	1	-5/+5
\| \|/ /
* \| \|	am 026194b8: Merge "Remove no-longer used timeFormat12 and timeFormat24."	Elliott Hughes	2014-10-28	1	-10/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Remove no-longer used timeFormat12 and timeFormat24."	Elliott Hughes	2014-10-23	1	-10/+1
\| \|\ \
\| \| * \|	Remove no-longer used timeFormat12 and timeFormat24.	Elliott Hughes	2014-10-23	1	-10/+1
\| \|/ /
* \| \|	am 9aee9663: Merge "Only allow once GC request at a time."	Mathieu Chartier	2014-10-28	1	-7/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "Only allow once GC request at a time."	Mathieu Chartier	2014-10-23	1	-7/+2
\| \|\ \