frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am c0232642: am 629daddd: Merge "Fix layoutlib build."	Narayan Kamath	2014-03-14	1	-1/+1
\|\
\| *	Fix layoutlib build.	Narayan Kamath	2014-03-14	1	-1/+1
* \|	resolved conflicts for merge of c76345a3 to klp-dev-plus-aosp	Deepanshu Gupta	2014-03-12	2	-4/+20
\|\ \ \| \|/
\| *	Merge "Fix the delegate method signatures in LayoutLib"	Deepanshu Gupta	2014-03-11	6	-94/+46
\| \|\
\| \| *	Fix the delegate method signatures in LayoutLib	Deepanshu Gupta	2014-03-05	6	-94/+46
* \| \|	am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."	Narayan Kamath	2014-03-11	1	-50/+25
\|\ \ \ \| \|/ /
\| * \|	LP64: Make 9 patches architecture agnostic.	Narayan Kamath	2014-03-10	1	-50/+25
* \| \|	am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sys...	David 'Digit' Turner	2014-03-11	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "aidl: Support building with updated host sysroot."	David 'Digit' Turner	2014-03-05	1	-0/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	aidl: Support building with updated host sysroot.	David 'Digit' Turner	2014-03-05	1	-0/+2
* \| \|	am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."	Ying Wang	2014-03-11	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Fix indirect misuse of $(my-dir).	Ying Wang	2014-02-28	1	-1/+1
* \| \|	am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"	Xavier Ducrohet	2014-03-11	1	-5/+0
\|\ \ \ \| \|/ /
\| * \|	Update layoutlib method for SystemClock	Deepanshu Gupta	2014-02-24	1	-5/+0
\| \|/
* \|	am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."	Narayan Kamath	2014-03-07	8	-224/+522
\|\ \ \| \|/
\| *	Extended locales in AAPT / AssetManager.	Narayan Kamath	2014-02-14	8	-224/+522
* \|	am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t."	Narayan Kamath	2014-03-07	2	-3/+2
\|\ \ \| \|/
\| *	Change ResourceType cookies to int32_t.	Narayan Kamath	2014-01-31	2	-3/+2
* \|	am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in Propert...	Narayan Kamath	2014-03-06	1	-4/+4
\|\ \ \| \|/
\| *	Merge "AArch64: Use of long for pointers in PropertyValuesHolder"	Narayan Kamath	2014-01-30	1	-4/+4
\| \|\
\| \| *	AArch64: Use of long for pointers in PropertyValuesHolder	Ashok Bhat	2014-01-29	1	-4/+4
* \| \|	resolved conflicts for merge of cb7cdd50 to klp-dev-plus-aosp	Brian Carlstrom	2014-03-06	3	-3/+3
\|\ \ \ \| \|/ /
\| * \|	Fix a few more delegate methods in layoutlib.	Narayan Kamath	2014-01-29	3	-4/+4
\| \|/
* \|	am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMA...	Xavier Ducrohet	2014-02-20	1	-0/+3
\|\ \
\| * \	Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp...	Xavier Ducrohet	2014-02-20	1	-0/+3
\| \|\ \
\| \| * \|	Set default text style in layoutlib as NORMAL [DO NOT MERGE]	Deepanshu Gupta	2014-02-19	1	-0/+3
* \| \| \|	am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in l...	Deepanshu Gupta	2014-02-20	1	-3/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]	Deepanshu Gupta	2014-02-19	1	-3/+5
\| \|/ /
* \| \|	am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.	Deepanshu Gupta	2014-02-10	1	-40/+45
\|\ \ \ \| \|/ /
\| * \|	Improve text rendering and measurement.	Deepanshu Gupta	2014-02-06	1	-40/+45
* \| \|	am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev	Deepanshu Gupta	2014-02-06	2	-3/+102
\|\ \ \ \| \|/ /
\| * \|	Merge "Add methods for Time_Delegate" into klp-dev	Deepanshu Gupta	2014-02-06	2	-3/+102
\| \|\ \
\| \| * \|	Add methods for Time_Delegate	Deepanshu Gupta	2014-01-31	2	-3/+102
* \| \| \|	am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into...	Deepanshu Gupta	2014-02-06	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Optimize layout rendering in layoutlib" into klp-dev	Deepanshu Gupta	2014-02-06	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Optimize layout rendering in layoutlib	Deepanshu Gupta	2014-01-20	1	-2/+2
\| \| \|/ /
* \| \| \|	am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for ...	Deepanshu Gupta	2014-02-06	9	-31/+143
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev	Deepanshu Gupta	2014-02-06	9	-31/+143
\| \|\ \ \
\| \| * \| \|	Add missing files to fix libphonenumber for layoutlib.	Deepanshu Gupta	2014-01-17	9	-31/+143
\| \| \|/ /
* \| \| \|	am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into kl...	Deepanshu Gupta	2014-02-06	3	-41/+60
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Fix the measurement of text bounds." into klp-dev	Deepanshu Gupta	2014-02-06	3	-41/+60
\| \|\ \ \
\| \| * \| \|	Fix the measurement of text bounds.	Deepanshu Gupta	2014-01-07	3	-41/+60
\| \| \|/ /
* \| \| \|	am d5129e75: am 8a892279: Fix a bug in Nine Patch library.	Deepanshu Gupta	2014-02-06	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix a bug in Nine Patch library.	Deepanshu Gupta	2014-02-05	1	-2/+2
\| \|/ /
* \| \|	resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp	Narayan Kamath	2014-01-28	38	-344/+344
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Track 64bit changes to android/graphics.	Narayan Kamath	2014-01-28	38	-344/+344
* \| \|	am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and n...	Narayan Kamath	2014-01-27	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	AssetManager cookies should be int32_t and not void*.	Narayan Kamath	2014-01-27	1	-1/+1
* \| \|	am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings."	Narayan Kamath	2013-12-18	1	-5/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Don't pseudolocalize untranslatable strings."	Narayan Kamath	2013-12-18	1	-5/+13
\| \|\ \