frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix typo.	Dianne Hackborn	2013-02-25	1	-1/+1
*	Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!	Dianne Hackborn	2013-02-12	1	-0/+5
*	resolved conflicts for merge of c71c678e to master	Xavier Ducrohet	2013-01-15	1	-1/+7
\|\
\| *	am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1....	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \|\
\| \| *	am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \| \|\
\| \| \| *	resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev	Xavier Ducrohet	2013-01-15	1	-0/+19
\| \| \| \|\
\| \| \| \| *	Fix the single crunch command to return the right error code.	Xavier Ducrohet	2013-01-15	1	-1/+5
\| \| \| \| *	Add single crunch command to aapt. do not merge.	Xavier Ducrohet	2013-01-02	4	-8/+62
\| \| \| \|/
\| \| * \|	am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt	Christopher Tate	2012-11-29	4	-5/+148
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Cache resource ID lookups in aapt	Christopher Tate	2012-11-28	4	-5/+148
\| \| \| *	Fix writing text version of styleable IDs. do not merge.	Xavier Ducrohet	2012-09-26	1	-1/+1
\| \| \|/
* \| \|	Add single crunch command to aapt.	Xavier Ducrohet	2013-01-02	4	-8/+62
\|/ /
* \|	Cache resource ID lookups in aapt	Christopher Tate	2012-11-27	4	-5/+148
* \|	am 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs."	Xavier Ducrohet	2012-09-26	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	am fb34490f: Merge "Fix writing text version of styleable IDs."	Xavier Ducrohet	2012-09-26	1	-1/+1
\| \|\
\| \| *	Fix writing text version of styleable IDs.	Xavier Ducrohet	2012-09-26	1	-1/+1
* \| \|	am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols optio...	Xavier Ducrohet	2012-09-17	3	-14/+205
\|\ \ \ \| \|/ /
\| * \|	am 31820a35: Merge "Add --output-text-symbols option to aapt."	Xavier Ducrohet	2012-09-17	3	-14/+205
\| \|\ \ \| \| \|/
\| \| *	Add --output-text-symbols option to aapt.	Xavier Ducrohet	2012-09-11	3	-14/+205
* \| \|	am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert op...	Xavier Ducrohet	2012-09-17	3	-19/+60
\|\ \ \ \| \|/ /
\| * \|	am d7252571: Merge "Add --error-on-failed-insert option to aapt."	Xavier Ducrohet	2012-09-17	3	-19/+60
\| \|\ \ \| \| \|/
\| \| *	Add --error-on-failed-insert option to aapt.	Xavier Ducrohet	2012-09-11	3	-19/+60
* \| \|	am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header fi...	Elliott Hughes	2012-09-09	2	-2/+1
\|\ \ \ \| \|/ /
\| * \|	am bfe1ab82: Merge "Fix aapt to get expat header files from the approved loca...	Elliott Hughes	2012-09-09	2	-2/+1
\| \|\ \ \| \| \|/
\| \| *	Fix aapt to get expat header files from the approved location.	Elliott Hughes	2012-09-09	2	-2/+1
* \| \|	Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources	Fabrice Di Meglio	2012-09-06	1	-2/+2
* \| \|	Add support for "-rtl" in resources	Fabrice Di Meglio	2012-08-23	3	-7/+67
\|/ /
* \|	am e67f8c8c: Merge "Normalize output from aapt d xmltree"	Jean-Baptiste Queru	2012-08-08	1	-1/+2
\|\ \ \| \|/
\| *	Merge "Normalize output from aapt d xmltree"	Jean-Baptiste Queru	2012-08-08	1	-1/+2
\| \|\
\| \| *	Normalize output from aapt d xmltree	Shachar Shemesh	2012-07-08	1	-1/+2
* \| \|	am b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." ...	Xavier Ducrohet	2012-07-19	1	-17/+31
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix aapt -G to properly support class attr in fragment.	Xavier Ducrohet	2012-07-19	1	-17/+31
* \| \|	am 8c71784e: Merge "Initialize mJunkPath to false"	Jean-Baptiste Queru	2012-06-22	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Initialize mJunkPath to false	Haitao Feng	2012-06-22	1	-1/+1
* \| \|	am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev	Dianne Hackborn	2012-06-12	1	-1/+3
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fix issue #6641368: can't launch gallery	Dianne Hackborn	2012-06-11	1	-1/+3
* \| \|	am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt bui...	Jean-Baptiste Queru	2012-06-05	1	-0/+4
\|\ \ \
\| * \ \	am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac O...	Jean-Baptiste Queru	2012-06-05	1	-0/+4
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.	Ying Wang	2012-06-05	1	-0/+4
* \| \| \|	am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"	Tor Norbye	2012-06-05	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 36ac43ba: Merge "Tweak default ignore-assets path"	Tor Norbye	2012-06-05	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Tweak default ignore-assets path	Tor Norbye	2012-06-04	1	-1/+1
\| * \| \|	am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"	Jean-Baptiste Queru	2012-06-02	1	-1/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "aapt: Remove terminal pointer incrementaion"	Jean-Baptiste Queru	2012-06-02	1	-1/+0
\| \| \|\ \
\| \| \| * \|	aapt: Remove terminal pointer incrementaion	Nobuhiro Hayashi	2012-03-30	1	-1/+0
\| \| * \| \|	Merge "Fix length of pattern." DO NOT MERGE.	Ying Wang	2012-05-24	1	-0/+1
\| \|/ / /
* \| \| \|	am 996b073e: Fix length of pattern.	Ying Wang	2012-05-22	1	-0/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix length of pattern.	Ying Wang	2012-05-22	1	-0/+1
\| * \| \|	Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev	Raphael Moll	2012-05-21	3	-45/+99
\| \|\ \ \
\| \| * \| \|	Merge "AAPT: support a new --ignore-assets flag."	Raphael Moll	2012-05-18	3	-45/+99