frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of e0b14ea7 to master	Kenny Root	2013-12-13	7	-84/+23
\|\
\| *	am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead o...	Kenny Root	2013-12-13	7	-84/+23
\| \|\
\| \| *	am 37c69fdd: Merge "Use java.util.Objects instead on internal API"	Kenny Root	2013-12-13	7	-84/+23
\| \| \|\
\| \| \| *	Use java.util.Objects instead on internal API	Kenny Root	2013-12-13	7	-84/+23
* \| \| \|	Merge "3d view system!"	Chris Craik	2013-12-13	4	-7/+98
\|\ \ \ \
\| * \| \| \|	3d view system!	Chris Craik	2013-12-12	4	-7/+98
* \| \| \| \|	Fixing some accessibility bugs.	Svetoslav	2013-12-13	2	-11/+11
* \| \| \| \|	Merge "Use StrictJarFile instead of JarFile for cert collection."	Narayan Kamath	2013-12-13	1	-14/+16
\|\ \ \ \ \
\| * \| \| \| \|	Use StrictJarFile instead of JarFile for cert collection.	Narayan Kamath	2013-12-12	1	-14/+16
* \| \| \| \| \|	Merge "Fix SDK build break due to link in hidden field in comment"	Yorke Lee	2013-12-13	1	-3/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix SDK build break due to link in hidden field in comment	Yorke Lee	2013-12-12	1	-3/+2
* \| \| \| \| \| \|	am 9c514b8f: am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc u...	Katie McCormick	2013-12-13	1	-7/+9
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update...	Katie McCormick	2013-12-13	1	-7/+9
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." ...	Katie McCormick	2013-12-12	1	-7/+9
\| \| \|\ \ \ \ \
\| \| \| * \ \ \ \	am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs	Katie McCormick	2013-12-13	1	-7/+9
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	Doc update: Update package summary for BT.	Katie McCormick	2013-12-12	1	-7/+9
* \| \| \| \| \| \| \| \|	Merge "Fix socket descriptor leak from Zygote to child app"	Dave Platt	2013-12-13	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix socket descriptor leak from Zygote to child app	Dave Platt	2013-12-12	1	-0/+6
* \| \| \| \| \| \| \| \|	Merge "ContactsContract api changes"	Yorke Lee	2013-12-13	1	-38/+39
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	ContactsContract api changes	Yorke Lee	2013-12-04	1	-38/+39
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge "Expose CallLog provider fields as public API"	Yorke Lee	2013-12-13	1	-28/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Expose CallLog provider fields as public API	Yorke Lee	2013-11-22	1	-28/+18
* \| \| \| \| \| \| \| \|	Merge "Adding INfcUnlockSettings and NfcUnlock interface class."	Andres Morales	2013-12-12	5	-0/+356
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adding INfcUnlockSettings and NfcUnlock interface class.	Andres Morales	2013-12-09	5	-0/+356
* \| \| \| \| \| \| \| \|	Merge "Verify drawables added to ViewOverlay so they can be scheduled"	Alan Viverette	2013-12-12	1	-0/+5
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Verify drawables added to ViewOverlay so they can be scheduled	Alan Viverette	2013-12-11	1	-0/+5
* \| \| \| \| \| \| \| \| \|	Merge "Add caption window color attribute"	Alan Viverette	2013-12-12	2	-11/+27
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Add caption window color attribute	Alan Viverette	2013-12-11	2	-11/+27
* \| \| \| \| \| \| \| \| \| \|	am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string ...	Marco Nelissen	2013-12-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.par...	Marco Nelissen	2013-12-11	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	am ce3bd309: Merge "Parse UUID string with Long.parseLong"	Marco Nelissen	2013-12-11	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge "Parse UUID string with Long.parseLong"	Marco Nelissen	2013-12-11	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Parse UUID string with Long.parseLong	Tom Marshall	2013-12-06	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite inte...	Scott Main	2013-12-11	1	-13/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| / / / / / / / \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and ...	Scott Main	2013-12-11	1	-13/+15
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents suppo...	Scott Main	2013-12-10	1	-13/+15
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	am df75bdcc: rewrite intent guide and add doc with intents supported by platf...	Scott Main	2013-12-11	1	-13/+15
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	rewrite intent guide and add doc with intents supported by platform apps	Scott Main	2013-12-10	1	-13/+15
* \| \| \| \| \| \| \| \| \| \|	Merge "CameraMetadata: updated generated code (with markdown support)"	Igor Murashkin	2013-12-11	4	-1335/+695
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	CameraMetadata: updated generated code (with markdown support)	Igor Murashkin	2013-12-10	4	-1335/+695
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Expose new API for querying whether a certificate was user added."	William Luh	2013-12-11	1	-0/+14
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Expose new API for querying whether a certificate was user added.	William Luh	2013-11-19	1	-0/+14
\| * \| \| \| \| \| \| \| \| \| \| \|	am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." int...	Sascha Prueter	2013-11-18	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unav...	Christopher Tate	2013-11-18	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge "Revert "Expose new API for querying whether a certificate was user add...	William Luh	2013-11-19	1	-13/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Expose new API for querying whether a certificate was user added."	William Luh	2013-11-19	1	-13/+0
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Expose new API for querying whether a certificate was user added."	William Luh	2013-11-19	1	-0/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose new API for querying whether a certificate was user added.	William Luh	2013-11-12	1	-0/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Unbreak display list debug dumping"	John Reck	2013-12-10	5	-25/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unbreak display list debug dumping	John Reck	2013-12-10	5	-25/+20