frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge changes I0ab47e2f,Ib8016996	Conley Owens	2011-04-27	1	-1/+2
\|\
\| *	Normalize output of XMLtree content	Shachar Shemesh	2011-04-11	1	-1/+2
* \|	Runtime resource overlay, iteration 1.	Mårten Kongstad	2011-04-01	3	-1/+12
\|/
*	am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\|\
\| *	Add --non-constant-id to aapt.	Xavier Ducrohet	2011-02-14	3	-6/+20
* \|	am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-2/+4
\|\ \ \| \|/
\| *	Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-2/+4
\| \|\
\| \| *	Normalize output from aapt d	Shachar Shemesh	2011-01-04	1	-2/+4
* \| \|	am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"	Dianne Hackborn	2011-01-29	1	-5/+3
\|\ \ \ \| \|/ /
\| * \|	Merge "Make AaptGroupEntry::getMncName accept mnc00"	Dianne Hackborn	2011-01-29	1	-5/+3
\| \|\ \
\| \| * \|	Make AaptGroupEntry::getMncName accept mnc00	Johan Redestig	2011-01-04	1	-5/+3
\| \| \|/
* \| \|	am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"	Dianne Hackborn	2011-01-23	1	-0/+16
\|\ \ \ \| \|/ /
\| * \|	aapt: Allow raw "%" in unformatted string-arrays	Josh Stone	2011-01-22	1	-0/+16
\| \|/
* \|	am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename ta...	Dan Morrill	2010-12-14	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	GL texture filtering changed from AND to OR, so rename tag name to match.	Dan Morrill	2010-12-13	1	-2/+2
* \|	am 5580e44c: Merge "Support changing style parent in overlays"	Jean-Baptiste Queru	2010-11-05	1	-14/+0
\|\ \
\| * \	Merge "Support changing style parent in overlays"	Jean-Baptiste Queru	2010-11-04	1	-14/+0
\| \|\ \
\| \| * \|	Support changing style parent in overlays	Martin Nordholts	2010-08-17	1	-14/+0
* \| \| \|	am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread	Scott Main	2010-11-05	1	-2/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	fix xlarge support in aapt for gingerbread	Scott Main	2010-11-04	1	-2/+2
* \| \| \|	am 63e5d07e: Merge "Fix issue with project resources overriding framework res...	Xavier Ducrohet	2010-10-27	3	-19/+22
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix issue with project resources overriding framework resources.	Xavier Ducrohet	2010-10-26	3	-19/+22
* \| \| \|	am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors....	Xavier Ducrohet	2010-10-26	3	-11/+104
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix rendering of digitalClock/Gallery in Eclipse editors.	Xavier Ducrohet	2010-10-26	3	-11/+104
* \| \| \|	am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"	Xavier Ducrohet	2010-10-22	2	-2/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Make layoutlib use the prebuilt of layoutlib_api	Xavier Ducrohet	2010-10-21	2	-2/+2
* \| \| \|	am ba501785: Merge "Implement issue #3116702: New manifest tags for supported...	Dianne Hackborn	2010-10-21	1	-9/+50
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Implement issue #3116702: New manifest tags for supported screen sizes DO NO...	Dianne Hackborn	2010-10-21	1	-9/+50
* \| \| \|	am 004f968d: Merge "Link against the static libcrypto in external/openssl." i...	Ying Wang	2010-10-18	1	-14/+11
\|\ \ \ \ \| \|/ / /
\| * \| \|	Link against the static libcrypto in external/openssl.	Ying Wang	2010-10-14	1	-14/+11
* \| \| \|	am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread	Joe Onorato	2010-10-14	1	-7/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	Do not build pbkdf2gen on non-Linux hosts	Kenny Root	2010-10-14	1	-7/+10
* \| \| \|	am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread	Kenny Root	2010-10-13	4	-11/+192
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "OBB: use PBKDF2 for key generation." into gingerbread	Kenny Root	2010-10-13	4	-11/+192
\| \|\ \ \
\| \| * \| \|	OBB: use PBKDF2 for key generation.	Kenny Root	2010-10-13	4	-11/+192
* \| \| \| \|	am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into ginge...	Jesse Wilson	2010-10-13	2	-1/+13
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Regenerate preloaded classes for Gingerbread." into gingerbread	Jesse Wilson	2010-10-13	2	-1/+13
\| \|\ \ \ \
\| \| * \| \| \|	Regenerate preloaded classes for Gingerbread.	Jesse Wilson	2010-10-13	2	-1/+13
\| \| \|/ / /
* \| \| \| \|	am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable...	Dan Morrill	2010-10-13	1	-0/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify	Dan Morrill	2010-10-13	1	-0/+9
\| \|/ / /
\| * \| \|	Avoid pre-processing images when they won't be used	Anthony Newnam	2010-10-06	1	-1/+3
* \| \| \|	am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into ginge...	Xavier Ducrohet	2010-10-07	1	-5/+11
\|\ \ \ \ \| \|/ / /
\| * \| \|	Parser is optional in obtainStyledAttributes.	Xavier Ducrohet	2010-10-04	1	-5/+11
* \| \| \|	am 407f625a: Add new API to find out whether external storage is removable.	Dianne Hackborn	2010-10-04	1	-8/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add new API to find out whether external storage is removable.	Dianne Hackborn	2010-10-04	1	-8/+10
* \| \| \|	am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread	Kenny Root	2010-10-01	1	-3/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add "none" for vold and deprecate mkobb -c	Kenny Root	2010-10-01	1	-3/+2
* \| \| \|	am 735de3b3: Hash keys with MD5; track IBinders not IInterface	Kenny Root	2010-09-30	1	-9/+21
\|\ \ \ \ \| \|/ / /
\| * \| \|	Hash keys with MD5; track IBinders not IInterface	Kenny Root	2010-09-30	1	-9/+21
* \| \| \|	am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gi...	Ying Wang	2010-09-28	1	-8/+4
\|\ \ \ \ \| \|/ / /