frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix ...	Narayan Kamath	2014-02-20	1	-39/+36
\|\
\| *	am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"	Narayan Kamath	2014-02-20	1	-39/+36
\| \|\
\| \| *	libandroidfw: fix build error for 64-bit	Patrik Bannura	2014-02-20	1	-39/+36
\| * \|	am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."	Narayan Kamath	2014-02-17	3	-46/+114
\| \|\ \ \| \| \|/
\| \| *	Extended locales in AAPT / AssetManager.	Narayan Kamath	2014-02-14	3	-46/+114
\| * \|	am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/count...	Narayan Kamath	2014-02-17	3	-45/+347
\| \|\ \ \| \| \|/
\| \| *	AssetManager support for 3 letter lang/country codes.	Narayan Kamath	2014-02-14	3	-45/+347
\| * \|	am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"	Narayan Kamath	2014-02-12	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Use size_t* in AssetManager::createIdmap	Colin Cross	2014-02-11	1	-1/+1
* \| \|	Merge "Support HardwareLayers in RenderThread"	John Reck	2014-02-19	6	-27/+114
\|\ \ \
\| * \| \|	Support HardwareLayers in RenderThread	John Reck	2014-02-19	6	-27/+114
* \| \| \|	Merge "Make outline and shadow APIs public"	Chris Craik	2014-02-19	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Make outline and shadow APIs public	Chris Craik	2014-02-18	2	-4/+4
* \| \| \| \|	Merge "Separate spot and ambient shadow strength setting"	ztenghui	2014-02-19	3	-19/+30
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Separate spot and ambient shadow strength setting	ztenghui	2014-02-13	3	-19/+30
* \| \| \| \|	Refcounting is hard	John Reck	2014-02-14	2	-1/+2
* \| \| \| \|	resolved conflicts for merge of 1cbea39f to master	Nick Kralevich	2014-02-12	2	-172/+218
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	resolved conflicts for merge of dd3d95f1 to klp-volantis-dev	Nick Kralevich	2014-02-12	2	-172/+218
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp	Nick Kralevich	2014-02-12	2	-172/+218
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Merge "Runtime resource overlay, iteration 2"	Dianne Hackborn	2014-02-11	2	-172/+218
\| \| \| \|\ \
\| \| \| \| * \|	Runtime resource overlay, iteration 2	Mårten Kongstad	2014-02-03	2	-172/+218
\| * \| \| \| \|	am be83e4a0: am 38f96e50: Add support for injecting events into ActivityConta...	Jeff Brown	2014-02-12	3	-91/+147
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 38f96e50: Add support for injecting events into ActivityContainers. (DO NO...	Jeff Brown	2014-02-12	3	-91/+147
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Add support for injecting events into ActivityContainers. (DO NOT MERGE)	Jeff Brown	2014-02-11	3	-91/+147
\| * \| \| \| \| \|	Fix build.	Dianne Hackborn	2014-02-11	1	-2/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge "Revert "Refactor setting an SkPaint onto a hwui Layer.""	Derek Sollenberger	2014-02-12	5	-13/+18
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Revert "Refactor setting an SkPaint onto a hwui Layer."	Derek Sollenberger	2014-02-12	5	-13/+18
* \| \| \| \| \| \|	Merge "Refactor setting an SkPaint onto a hwui Layer."	Derek Sollenberger	2014-02-12	5	-18/+13
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Refactor setting an SkPaint onto a hwui Layer.	Derek Sollenberger	2014-02-12	5	-18/+13
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Fix build.	Dianne Hackborn	2014-02-11	1	-2/+2
* \| \| \| \| \|	am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"	Dianne Hackborn	2014-02-11	2	-1/+26
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / /
\| * \| \| \|	am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"	Dianne Hackborn	2014-02-11	2	-1/+26
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge "New command line tool 'idmap'"	Dianne Hackborn	2014-02-11	2	-1/+26
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	New command line tool 'idmap'	Mårten Kongstad	2014-02-03	2	-1/+26
* \| \| \| \|	Merge "Move inputservice over to frameworks/native"	Michael Wright	2014-02-11	19	-22538/+6
\|\ \ \ \ \
\| * \| \| \| \|	Move inputservice over to frameworks/native	Michael Wright	2014-02-11	19	-22538/+6
* \| \| \| \| \|	Implement missing safelyRun() on ThreadedRenderer	John Reck	2014-02-11	4	-0/+26
* \| \| \| \| \|	Merge "Refactor HardwareLayer"	John Reck	2014-02-11	5	-7/+280
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Refactor HardwareLayer	John Reck	2014-02-10	5	-7/+280
* \| \| \| \| \| \|	am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic ...	Narayan Kamath	2014-02-11	1	-4/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type ins...	Narayan Kamath	2014-02-11	1	-4/+2
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Fix TinyHashMap to use generic hash_type instead of hash_t	Ashok Bhat	2014-02-07	1	-4/+2
* \| \| \| \| \|	Merge "Revert "Move inputservice over to frameworks/native""	Michael Wright	2014-02-10	16	-6/+17144
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Revert "Move inputservice over to frameworks/native"	Michael Wright	2014-02-10	16	-6/+17144
* \| \| \| \| \|	Merge "Move inputservice over to frameworks/native"	Michael Wright	2014-02-10	16	-17144/+6
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Move inputservice over to frameworks/native	Michael Wright	2014-02-10	16	-17144/+6
* \| \| \| \| \|	Merge "Remove SkRegion dependency from libinput"	Michael Wright	2014-02-10	3	-8/+21
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Remove SkRegion dependency from libinput	Michael Wright	2014-02-10	3	-8/+21
* \| \| \| \| \|	Merge "Removing SkiaColorFilter and inspecting the native object directly."	Derek Sollenberger	2014-02-10	19	-621/+230
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Removing SkiaColorFilter and inspecting the native object directly.	Derek Sollenberger	2014-02-07	19	-621/+230