frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...	Adam Lesinski	2014-09-19	3	-3/+225
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'fa31eb2c' into manualmerge	Adam Lesinski	2014-11-10	4	-22/+55
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	split-select: Fix rules generated for anydpi density	Adam Lesinski	2014-11-06	4	-22/+55
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'fb96e54' into manualmerge	Adam Lesinski	2014-11-05	8	-5/+238
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add error checking to aapt for split generation	Adam Lesinski	2014-11-03	8	-5/+237
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix automerge issue	Adam Lesinski	2014-11-03	1	-2/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp	Adam Lesinski	2014-11-04	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build due to bad merge	Adam Lesinski	2014-11-03	1	-1/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 su...	Adam Lesinski	2014-11-04	1	-3/+37
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / \|/\| / / / / / / / / / / / / / / / \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev	Adam Lesinski	2014-11-03	1	-3/+37
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build the split-select tool without C++11 support	Adam Lesinski	2014-11-03	1	-3/+37
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '78be0498' into manualmerge	Adam Lesinski	2014-11-03	7	-43/+44
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issues that will be present in C++11	Adam Lesinski	2014-11-03	9	-63/+64
\| \|/ / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76	Tim Kilbourn	2014-10-24	1	-1/+24
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	aapt updates for Android TV	Tim Kilbourn	2014-10-24	1	-1/+24
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'cd8442d4' into manualmerge	Adam Lesinski	2014-10-23	4	-4/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First commit of split-select tool	Adam Lesinski	2014-10-23	4	-7/+10
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."	Dan Albert	2014-10-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an overflow found by ASAN.	Dan Albert	2014-10-20	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for...	Adam Lesinski	2014-10-20	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated resources...	Adam Lesinski	2014-10-20	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	AAPT: Fix path for final generated resources on Windows	Adam Lesinski	2014-10-20	1	-1/+4
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue...	Adam Lesinski	2014-10-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was...	Adam Lesinski	2014-10-17	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	AAPT: Fix an issue where a resource name was incorrectly derived on Windows	Adam Lesinski	2014-10-17	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes"...	Adam Lesinski	2014-10-17	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Minor resource notation/compatibility fixes	Adam Lesinski	2014-10-17	1	-3/+3
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon mod...	Jerome Dochez	2014-10-10	4	-0/+40
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge "Added a daemon mode to aapt to receive streams of commands from gradle...	Jerome Dochez	2014-10-10	4	-0/+40
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Added a daemon mode to aapt to receive streams of commands from gradle.	Jerome Dochez	2014-10-02	4	-0/+40
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 res...	Adam Lesinski	2014-10-04	1	-20/+26
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	AAPT: Gate v21 resource synthesizing logging behind -v flag	Adam Lesinski	2014-10-03	1	-20/+26
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h f...	Stephen Hines	2014-10-02	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	include direct.h for _mkdir	Andrew Hsieh	2014-09-30	1	-0/+3
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"	Andreas Gampe	2014-10-02	4	-30/+51
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Frameworks/base: Fix more aapt issues	Andreas Gampe	2014-10-01	4	-30/+51
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp	Andreas Gampe	2014-10-01	13	-387/+540
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Frameworks/base: Fix AAPT warnings	Andreas Gampe	2014-10-01	14	-389/+527
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-10-01	5	-142/+22
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Use std::sort instead of qsort_r wrapper.	Dan Albert	2014-10-01	5	-142/+22
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue wi...	Adam Lesinski	2014-09-26	2	-1/+19
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	AAPT: Fix issue with synthesized resource not actually showing up	Adam Lesinski	2014-09-24	2	-1/+19
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	am d4e5b601: am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation...	Adam Lesinski	2014-09-22	9	-36/+316
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	AAPT: Continuation of public/private attribute fix	Adam Lesinski	2014-09-22	9	-36/+316
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp	Dan Albert	2014-09-19	1	-3/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Clean up makefile cruft.	Dan Albert	2014-09-11	1	-4/+3
* \| \| \|	am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards comp...	Adam Lesinski	2014-09-19	3	-3/+225
\|\ \ \ \ \| \| \|/ / \| \|/\| / \| \|_\|/ \|/\| \|
\| * \|	Fix backwards compat problem with AAPT public attrs	Adam Lesinski	2014-09-18	3	-3/+225
* \| \|	am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the on...	Marcin Kosiba	2014-09-11	2	-104/+73
\|\ \ \ \| \|/ /
\| * \|	Merge "Don't use reflection when generating the onResourcesLoaded callback." ...	Marcin Kosiba	2014-09-11	2	-104/+73
\| \|\ \