frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \|	am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge	Adam Lesinski	2014-11-17	3	-3/+119
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge commit '06d8b7b8' into manualmerge	Adam Lesinski	2014-11-17	3	-3/+119
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge "Implement back-tracking when searching for attributes in XML or resour...	Adam Lesinski	2014-11-17	3	-3/+119
\| \| \|\ \ \
\| \| \| * \| \|	Implement back-tracking when searching for attributes in XML or resource bag	Adam Lesinski	2014-11-04	3	-3/+119
* \| \| \| \| \|	am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."	Elliott Hughes	2014-11-10	1	-15/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."	Elliott Hughes	2014-11-10	1	-15/+4
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	bionic's struct stat is now POSIX-compliant.	Elliott Hughes	2014-11-10	1	-15/+4
* \| \| \| \| \|	am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings"	Andreas Gampe	2014-11-09	3	-11/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 189bf056: Merge "Frameworks/base: Fix more warnings"	Andreas Gampe	2014-11-09	3	-11/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Frameworks/base: Fix more warnings	Andreas Gampe	2014-11-07	3	-11/+5
* \| \| \| \| \|	am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-p...	Andreas Gampe	2014-11-07	10	-247/+410
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp	Andreas Gampe	2014-11-07	10	-247/+410
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Frameworks/base: Wall Werror in libs/androidfw	Andreas Gampe	2014-11-07	10	-248/+410
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master	Bill Yi	2014-10-22	52	-1223/+4136
\| \| \|\ \ \
\| \| \| * \ \	am aeef612f: Merge "Search all packages for a given type string when looking ...	Adam Lesinski	2014-10-09	2	-43/+60
\| \| \| \|\ \ \
\| \| \| * \ \ \	am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...	Adam Powell	2014-10-01	1	-5/+1
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...	Adam Lesinski	2014-10-01	1	-1/+5
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp	Dan Albert	2014-09-19	1	-1/+0
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...	Adam Lesinski	2014-09-19	2	-1/+41
\| \| \| \|\ \ \ \ \ \ \
* \| \| \| \ \ \ \ \ \ \	am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-d...	Adam Lesinski	2014-11-05	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge commit 'fb96e54' into manualmerge	Adam Lesinski	2014-11-05	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add error checking to aapt for split generation	Adam Lesinski	2014-11-03	1	-0/+4
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	am 3fd34002: Merge commit \'78be0498\' into manualmerge	Adam Lesinski	2014-11-04	4	-44/+32
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge commit '78be0498' into manualmerge	Adam Lesinski	2014-11-03	4	-44/+32
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Merge "Fix issues that will be present in C++11" into lmp-mr1-dev	Adam Lesinski	2014-11-03	4	-56/+44
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Fix issues that will be present in C++11	Adam Lesinski	2014-11-03	4	-56/+44
* \| \| \| \| \| \| \| \| \| \|	am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and exp...	Alan Viverette	2014-10-31	1	-1/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...	Alan Viverette	2014-10-31	1	-1/+15
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	Distinguish unspecified and explicit null values in resources	Alan Viverette	2014-10-29	1	-1/+15
* \| \| \| \| \| \| \| \| \| \|	am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library wh...	Adam Lesinski	2014-10-28	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	am 31b76b66: Merge "libandroidfw: Do not build device library when building S...	Adam Lesinski	2014-10-28	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	libandroidfw: Do not build device library when building SDK	Adam Lesinski	2014-10-24	1	-0/+3
\| \| \|/ / / / / / / /
* \| \| \| \| \| \| \| \| \|	am 705f2ac4: am 879f237a: Merge "Added some more Split density tests" into lm...	Adam Lesinski	2014-10-24	36	-157/+803
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev	Adam Lesinski	2014-10-24	36	-157/+803
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Added some more Split density tests	Adam Lesinski	2014-10-23	36	-157/+803
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	am 827d00f2: am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENC...	Dan Albert	2014-10-21	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."	Dan Albert	2014-10-21	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	More LOCAL_ADDITIONAL_DEPENDENCIES.	Dan Albert	2014-10-21	1	-0/+2
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	am 97ce1a6a: am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Searc...	Adam Lesinski	2014-10-10	2	-43/+60
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all package...	Adam Lesinski	2014-10-10	2	-43/+60
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Search all packages for a given type string when looking up resources by name	Adam Lesinski	2014-10-09	2	-43/+60
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	am e18d68d6: am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Rever...	Adam Powell	2014-10-02	1	-5/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue ...	Adam Powell	2014-10-02	1	-5/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Revert "Fix issue with using locally defined attrs in a shared lib"	Adam Powell	2014-10-01	1	-5/+1
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
* \| \| \| \| \|	am 7923da5f: am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix i...	Adam Lesinski	2014-10-01	1	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with usi...	Adam Lesinski	2014-10-01	1	-1/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Fix issue with using locally defined attrs in a shared lib	Adam Lesinski	2014-09-30	1	-1/+5
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	am cd29983b: resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-09-19	1	-1/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-09-19	1	-1/+0
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge "Clean up test makefiles."	Dan Albert	2014-09-11	1	-5/+0
\| \| \|\ \ \