frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."	Yabin Cui	2015-01-27	2	-10/+2
\|\
\| *	kill HAVE_PTHREADS.	Yabin Cui	2015-01-26	2	-10/+2
* \|	am aee7225e: Merge "Process base APK" into lmp-mr1-dev	Adam Lesinski	2015-01-20	1	-1/+7
\|\ \
\| * \|	Process base APK	Adam Lesinski	2015-01-16	1	-1/+7
* \| \|	am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the co...	Chris Craik	2015-01-16	1	-4/+32
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fast loadInverse() implementation for the common case	Romain Guy	2015-01-15	1	-4/+32
* \| \|	Restore write_delete_file	Brian Carlstrom	2015-01-14	1	-0/+7
* \| \|	am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev	John Reck	2015-01-15	1	-0/+8
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "Vsyncs are hard" into lmp-mr1-dev	John Reck	2015-01-15	1	-0/+8
\| \|\ \
\| \| * \|	Vsyncs are hard	John Reck	2015-01-14	1	-0/+8
* \| \| \|	am 9568307c: am 43a4a8c7: Fix redundant file backups	Christopher Tate	2015-01-15	1	-36/+41
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix redundant file backups	Christopher Tate	2015-01-14	1	-38/+41
\| \|/ /
* \| \|	am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISL...	Elliott Hughes	2015-01-13	1	-1/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Use more intention-revealing tests for S_ISLNK and S_ISSOCK.	Elliott Hughes	2015-01-12	1	-1/+3
* \| \|	am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev	John Reck	2014-12-19	4	-15/+22
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Tweak RT-animator scheduling	John Reck	2014-12-19	4	-15/+22
* \| \|	am 93492d1a: am c748832f: Merge "Revert overdraw avoidance visualization chan...	Chris Craik	2014-12-17	3	-8/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Revert overdraw avoidance visualization change" into lmp-mr1-dev	Chris Craik	2014-12-17	3	-8/+13
\| \|\ \
\| \| * \|	Revert overdraw avoidance visualization change	Chris Craik	2014-12-17	3	-8/+13
* \| \| \|	Fix style	John Reck	2014-12-12	21	-175/+175
* \| \| \|	am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev	John Reck	2014-12-12	1	-0/+6
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Force-flush state sync on texid change" into lmp-mr1-dev	John Reck	2014-12-11	1	-0/+6
\| \|\ \ \
\| \| * \| \|	Force-flush state sync on texid change	John Reck	2014-12-11	1	-0/+6
* \| \| \| \|	am 63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev	Chris Craik	2014-12-12	1	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Correct layer size formatting in trace" into lmp-mr1-dev	Chris Craik	2014-12-11	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Correct layer size formatting in trace	Chris Craik	2014-12-11	1	-2/+2
\| \| \|/ /
* \| \| \|	am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev	John Reck	2014-12-11	11	-73/+75
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev	John Reck	2014-12-11	11	-73/+75
\| \|\ \ \
\| \| * \| \|	Don't preload textures for AssetAtlas	John Reck	2014-12-10	11	-73/+75
\| \| \|/ /
* \| \| \|	am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...	Adam Lesinski	2014-12-11	1	-0/+17
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Fix issue where non-resource attributes would cause obtainStyleAttribu...	Adam Lesinski	2014-12-10	1	-0/+17
\| \|\ \ \
\| \| * \| \|	Fix issue where non-resource attributes would cause obtainStyleAttributes to ...	Adam Lesinski	2014-12-10	1	-0/+17
* \| \| \| \|	resolve merge conflicts of ed211b9 to lmp-mr1-dev-plus-aosp.	Chris Craik	2014-12-10	4	-8/+19
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix frame-allocated path lifecycles	Chris Craik	2014-12-10	4	-8/+19
\| \| \|/ / \| \|/\| \|
* \| \| \|	resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp	John Reck	2014-12-09	1	-4/+6
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev	John Reck	2014-12-09	1	-2/+4
\| \|\ \ \
\| \| * \| \|	Teach AssetAtlas about more drawables	John Reck	2014-12-09	1	-2/+4
\| \| \|/ /
* \| \| \|	am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference count...	Derek Sollenberger	2014-12-09	1	-8/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Remove unnecessary/erroneous reference counting	Derek Sollenberger	2014-12-09	1	-8/+0
\| \|/ /
* \| \|	Merge commit '0953ab27' into manualmerge	Adam Lesinski	2014-12-05	1	-48/+57
\|\ \ \ \| \|/ /
\| * \|	Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev	Adam Lesinski	2014-12-04	1	-46/+57
\| \|\ \
\| \| * \|	AAPT: Move private attrs to new type for framework	Adam Lesinski	2014-12-03	1	-46/+57
* \| \| \|	resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp	John Reck	2014-12-04	6	-12/+13
\|\ \ \ \ \| \|/ / /
\| * \| \|	Resume RT-animations after a pauseSurface	John Reck	2014-12-03	6	-12/+13
\| \|/ /
* \| \|	am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"	Adam Lesinski	2014-12-04	1	-0/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "RRO: prevent duplicate system overlays"	Adam Lesinski	2014-12-03	1	-0/+6
\| \|\ \
\| \| * \|	RRO: prevent duplicate system overlays	Mårten Kongstad	2014-11-07	1	-0/+6
* \| \| \|	am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c	Adam Lesinski	2014-12-02	2	-5/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge changes If2c7e09f,Ie21f227c	Adam Lesinski	2014-12-02	2	-5/+9
\| \|\ \ \ \| \| \|/ /
\| \| * \|	RRO idmap: pad with 0xffffffff, not 0x00000000	Mårten Kongstad	2014-11-07	1	-5/+5