frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp	Neil Fuller	2014-10-02	4	-141/+3
\|\
\| *	am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"	Neil Fuller	2014-10-02	4	-141/+3
\| \|\
\| \| *	Merge "Switch from FloatMath -> Math and Math.hypot where possible"	Neil Fuller	2014-10-02	4	-141/+3
\| \| \|\
\| \| \| *	Switch from FloatMath -> Math and Math.hypot where possible	Neil Fuller	2014-10-01	4	-141/+3
* \| \| \|	am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"	Andreas Gampe	2014-10-02	4	-30/+51
\|\ \ \ \ \| \|/ / /
\| * \| \|	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-dev-plus-aosp	Andreas Gampe	2014-10-01	13	-387/+540
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings"	Andreas Gampe	2014-10-01	14	-389/+527
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Frameworks/base: Fix AAPT warnings	Andreas Gampe	2014-10-01	14	-389/+527
* \| \| \|	am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev	Deepanshu Gupta	2014-10-02	2	-202/+110
\|\ \ \ \
\| * \ \ \	Merge "Always resolve enum when resolving resources." into lmp-dev	Deepanshu Gupta	2014-10-02	2	-202/+110
\| \|\ \ \ \
\| \| * \| \| \|	Always resolve enum when resolving resources.	Deepanshu Gupta	2014-09-29	2	-202/+110
* \| \| \| \| \|	am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev	Stephen Hines	2014-10-01	2	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	include direct.h for _mkdir	Andrew Hsieh	2014-09-30	2	-0/+4
\| \|/ / / /
* \| \| \| \|	resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp	Dan Albert	2014-10-01	5	-142/+22
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper."	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 052c4c4b: Merge "Update time in layout preview" into lmp-dev	Deepanshu Gupta	2014-09-30	1	-2/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Update time in layout preview	Deepanshu Gupta	2014-09-29	1	-2/+1
* \| \| \|	am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...	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 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...	Adam Lesinski	2014-09-22	9	-36/+316
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev	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-dev-plus-aosp	Dan Albert	2014-09-19	1	-3/+1
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	am 799812cd: Merge "Clean up makefile cruft."	Dan Albert	2014-09-19	1	-4/+3
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Clean up makefile cruft.	Dan Albert	2014-09-11	1	-4/+3
* \| \| \| \|	am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...	Adam Lesinski	2014-09-19	3	-3/+225
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev	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 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev	Deepanshu Gupta	2014-09-16	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Build LayoutLib tests with Java 6" into lmp-dev	Deepanshu Gupta	2014-09-16	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Build LayoutLib tests with Java 6	Deepanshu Gupta	2014-09-16	1	-1/+1
* \| \| \| \|	am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mo...	John Spurlock	2014-09-14	1	-0/+5
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Saver: PowerManager call to set low power mode.	John Spurlock	2014-09-14	1	-0/+5
* \| \| \| \|	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
\| \|\ \ \ \
\| \| * \| \| \|	Don't use reflection when generating the onResourcesLoaded callback.	Marcin Kosiba	2014-09-11	2	-104/+73
* \| \| \| \| \|	am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev	Deepanshu Gupta	2014-09-11	3	-60/+166
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "LayoutLib: support font weights." into lmp-dev	Deepanshu Gupta	2014-09-11	3	-60/+166
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	LayoutLib: support font weights.	Deepanshu Gupta	2014-09-10	3	-60/+166
* \| \| \| \| \|	am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev	Dianne Hackborn	2014-09-10	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Fix build." into lmp-dev	Dianne Hackborn	2014-09-10	1	-0/+5
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix build.	Dianne Hackborn	2014-09-09	1	-0/+5
* \| \| \| \| \| \|	am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" i...	Adam Lesinski	2014-09-10	1	-2/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev	Adam Lesinski	2014-09-09	1	-2/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	AAPT: Don't crash on illegal symbol name	Adam Lesinski	2014-09-09	1	-2/+6
\| \| \| \|/ / / \| \| \|/\| \| \|
* \| \| \| \| \|	resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp	Dan Albert	2014-09-09	1	-10/+3
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	am 8085477f: Merge "Don\'t check for null references."	Dan Albert	2014-09-09	1	-11/+2
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|