frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am b0cb0734: Merge "Track change to Conscrypt"	Kenny Root	2014-11-03	2	-2/+2
\|\
\| *	Merge "Track change to Conscrypt"	Kenny Root	2014-11-03	2	-2/+2
\| \|\
\| \| *	Track change to Conscrypt	Kenny Root	2014-10-31	2	-2/+2
* \| \|	am 5f8099ed: Merge "Add java.util.List import."	Narayan Kamath	2014-11-03	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Add java.util.List import.	Narayan Kamath	2014-11-03	1	-0/+1
* \| \|	am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""	Narayan Kamath	2014-11-03	1	-77/+0
\|\ \ \ \| \|/ /
\| * \|	Revert "Revert "Remove unused apache related API.""	Narayan Kamath	2014-11-03	1	-77/+0
\| \|/
* \|	am e87d36f8: Merge "Revert "Remove unused apache related API.""	Narayan Kamath	2014-10-29	1	-0/+77
\|\ \ \| \|/
\| *	Revert "Remove unused apache related API."	Narayan Kamath	2014-10-27	1	-0/+77
* \|	resolved conflicts for merge of 9834af9c to stage-aosp-master	Narayan Kamath	2014-10-29	1	-35/+0
\|\ \ \| \|/
\| *	Remove unused apache related API.	Narayan Kamath	2014-10-24	1	-77/+0
* \|	am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."	Elliott Hughes	2014-10-28	2	-5/+5
\|\ \ \| \|/
\| *	Merge "Migrate off timeFormat12 and timeFormat24."	Elliott Hughes	2014-10-23	2	-5/+5
\| \|\
\| \| *	Migrate off timeFormat12 and timeFormat24.	Elliott Hughes	2014-10-23	2	-5/+5
* \| \|	am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation wi...	Neil Fuller	2014-10-20	1	-12/+31
\|\ \ \
\| * \ \	am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to M...	Neil Fuller	2014-10-20	1	-12/+31
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Replacing FloatMath native implementation with calls to Math"	Neil Fuller	2014-10-20	1	-12/+31
\| \| \|\ \
\| \| \| * \|	Replacing FloatMath native implementation with calls to Math	Nick Kralevich	2014-10-20	1	-12/+31
* \| \| \| \|	am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implement...	Elliott Hughes	2014-10-18	1	-7/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with ca...	Elliott Hughes	2014-10-18	1	-7/+4
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Revert "Replacing FloatMath native implementation with calls to Math""	Elliott Hughes	2014-10-18	1	-7/+4
\| \| \|\ \ \
\| \| \| * \| \|	Revert "Replacing FloatMath native implementation with calls to Math"	Elliott Hughes	2014-10-18	1	-7/+4
* \| \| \| \| \|	am 15e7b2ac: Merge "Translate compound button drawable by scroll position" in...	Alan Viverette	2014-10-18	1	-1/+9
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge "Translate compound button drawable by scroll position" into lmp-dev	Alan Viverette	2014-10-18	1	-1/+9
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Translate compound button drawable by scroll position	Alan Viverette	2014-10-17	1	-1/+9
* \| \| \| \| \| \| \|	am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" i...	Jim Miller	2014-10-17	1	-7/+17
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev	Jim Miller	2014-10-17	1	-7/+17
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add utility methods to LockPatternUtils for encryption	Jim Miller	2014-10-17	1	-7/+17
* \| \| \| \| \| \| \|	am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." int...	Svetoslav	2014-10-17	1	-31/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge "Accessibility no longer overrides strong encryption." into lmp-dev	Svetoslav	2014-10-17	1	-31/+0
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Accessibility no longer overrides strong encryption.	Svetoslav	2014-10-17	1	-31/+0
\| \| \|/ / / / / /
* \| \| \| \| \| \| \|	am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into l...	William Bourke	2014-10-17	1	-0/+24
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Modified lollipop Easter egg for TV compatibility	William Bourke	2014-10-17	1	-0/+24
\| \|/ / / / / /
* \| \| \| \| \| \|	am a865bb5d: Merge "Use the correct method to check if device is encrypted" i...	Amith Yamasani	2014-10-17	1	-4/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "Use the correct method to check if device is encrypted" into lmp-dev	Amith Yamasani	2014-10-17	1	-4/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Use the correct method to check if device is encrypted	Amith Yamasani	2014-10-17	1	-4/+1
* \| \| \| \| \| \| \|	am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev	Dianne Hackborn	2014-10-17	1	-0/+19
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	SDK only: hide the old L API version constant.	Dianne Hackborn	2014-10-16	1	-0/+19
\| \|/ / / / / /
* \| \| \| \| \| \|	am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"	Neil Fuller	2014-10-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am c7aa8fe6: Merge "Removing some more FloatMath references"	Neil Fuller	2014-10-17	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Removing some more FloatMath references"	Neil Fuller	2014-10-17	1	-1/+1
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Removing some more FloatMath references	Neil Fuller	2014-10-15	1	-1/+1
\| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
* \| \| \| \| \| \|	am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()	Prerepa Viswanadham	2014-10-16	1	-2/+3
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Update javadoc comments for getBluetoothLeAdvertiser()	Prerepa Viswanadham	2014-10-16	1	-2/+3
* \| \| \| \| \| \|	am 8a3785ca: am fd2d41b7: Merge "Replacing FloatMath native implementation wi...	Neil Fuller	2014-10-16	1	-4/+7
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am fd2d41b7: Merge "Replacing FloatMath native implementation with calls to M...	Neil Fuller	2014-10-16	1	-4/+7
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "Replacing FloatMath native implementation with calls to Math"	Neil Fuller	2014-10-16	1	-4/+7
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Replacing FloatMath native implementation with calls to Math	Neil Fuller	2014-10-15	1	-4/+7
\| \| \| \| \|_\|/ \| \| \| \|/\| \|
* \| \| \| \| \|	am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApp...	Brian Carlstrom	2014-10-16	1	-1/+3
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." int...	Brian Carlstrom	2014-10-16	1	-1/+3
\| \|\ \ \ \ \