frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "A11y: Use a backstop dialog timeout when a11y is enabled." into mnc-dev	John Spurlock	2015-06-11	1	-16/+16
\|\
\| *	A11y: Use a backstop dialog timeout when a11y is enabled.	John Spurlock	2015-06-11	1	-16/+16
* \|	Merge "Fix intermediate preview size selection for legacy." into mnc-dev	Ruben Brunk	2015-06-11	1	-3/+7
\|\ \
\| * \|	Fix intermediate preview size selection for legacy.	Ruben Brunk	2015-06-10	1	-3/+7
* \| \|	Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev	Yin-Chia Yeh	2015-06-11	2	-11/+14
\|\ \ \
\| * \| \|	Camera2: Legacy: handle FPS range properly	Yin-Chia Yeh	2015-06-11	2	-11/+14
* \| \| \|	Merge "Workaround shader crash" into mnc-dev	Chris Craik	2015-06-11	2	-2/+8
\|\ \ \ \
\| * \| \| \|	Workaround shader crash	Chris Craik	2015-06-10	2	-2/+8
* \| \| \| \|	Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev	Amit Mahajan	2015-06-11	1	-1/+5
\|\ \ \ \ \
\| * \| \| \| \|	Change to add STK_PERMISSION for stk related commands.	Amit Mahajan	2015-06-11	1	-1/+5
* \| \| \| \| \|	Merge "Revert contact metadata_sync constants." into mnc-dev	Zheng Fu	2015-06-11	1	-153/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Revert contact metadata_sync constants.	Zheng Fu	2015-06-10	1	-153/+0
* \| \| \| \| \| \|	Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded c...	Adam Lesinski	2015-06-11	3	-100/+392
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants	Adam Lesinski	2015-06-11	3	-100/+392
* \| \| \| \| \| \| \|	Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc...	Roozbeh Pournader	2015-06-11	1	-14/+7
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Merge EXTENDED font profile with the next (unnamed) profile.	Roozbeh Pournader	2015-06-11	1	-14/+7
* \| \| \| \| \| \| \| \|	Merge "Protect against null detail record." into mnc-dev	Jason Monk	2015-06-11	1	-1/+3
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Protect against null detail record.	Jason Monk	2015-06-11	1	-1/+3
* \| \| \| \| \| \| \| \| \|	Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev	Carlos Valdivia	2015-06-11	7	-230/+284
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Revert "Permissions: Fix account related permissions."	Carlos Valdivia	2015-06-11	7	-230/+284
* \| \| \| \| \| \| \| \| \| \|	Merge "Ignore some more generic USB device names." into mnc-dev	Jeff Sharkey	2015-06-11	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Ignore some more generic USB device names.	Jeff Sharkey	2015-06-11	1	-0/+6
* \| \| \| \| \| \| \| \| \| \| \|	Trace each stage of Choreographer driven frames	Chris Craik	2015-06-11	2	-13/+26
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix the PFD detachFd issue." into mnc-dev	Makoto Onuki	2015-06-11	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix the PFD detachFd issue.	Makoto Onuki	2015-06-11	1	-0/+3
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add more specific consumer names for common buffer queue endpoints." i...	Eino-Ville Talvala	2015-06-11	2	-0/+22
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add more specific consumer names for common buffer queue endpoints.	Eino-Ville Talvala	2015-06-09	2	-0/+22
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/2022...	Svet Ganov	2015-06-11	2	-24/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework	Svet Ganov	2015-06-11	2	-24/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Selected count string needs plurals." into mnc-dev	Jeff Sharkey	2015-06-11	5	-7/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Selected count string needs plurals.	Jeff Sharkey	2015-06-11	5	-7/+18
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Permissions: Fix account related permissions.	Carlos Valdivia	2015-06-11	7	-284/+230
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 405d58ff: am fd743227: Merge "Doc change: Remove disallow /preview from in...	Dirk Dougherty	2015-06-11	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	am fd743227: Merge "Doc change: Remove disallow /preview from indexing." into...	Dirk Dougherty	2015-06-11	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-...	Dirk Dougherty	2015-06-11	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc change: Remove disallow /preview from indexing.	Dirk Dougherty	2015-06-10	1	-1/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add bucket that unknown state playback falls into" into mnc-dev	Hyungtae Tim Kim	2015-06-11	2	-3/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bucket that unknown state playback falls into	Hyungtae Tim Kim	2015-06-11	2	-3/+16
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Remove device initializer status messages" into mnc-dev	Craig Lafayette	2015-06-11	8	-336/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove device initializer status messages	Craig Lafayette	2015-06-02	8	-336/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev	Alex Klyubin	2015-06-11	15	-202/+675
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Android Keystore keys are no longer backed by Conscrypt.	Alex Klyubin	2015-06-10	15	-202/+675
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Disable ResolverComparator's debug logging" into mnc-dev	Adam Powell	2015-06-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable ResolverComparator's debug logging	Adam Powell	2015-06-11	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am fd7a6b03: am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates...	Joe Fernandez	2015-06-11	2	-18/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| / / / / / / / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-...	Joe Fernandez	2015-06-11	2	-18/+32
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs	Joe Fernandez	2015-06-11	2	-18/+32
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "docs: studio 1.2.2.0 updates""	Rich Sloager	2015-06-11	2	-18/+32
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev	Adrian Roos	2015-06-11	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497	Adrian Roos	2015-06-11	1	-0/+4
\| \| \|_\|_\|/ / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|