frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-...	Adam Lesinski	2014-12-09	1	-5/+3
\|\
\| *	AAPT: Dump status of required flag for uses-feature	Adam Lesinski	2014-12-08	1	-5/+3
* \|	Merge commit '0953ab27' into manualmerge	Adam Lesinski	2014-12-05	2	-22/+164
\|\ \ \| \|/
\| *	Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev	Adam Lesinski	2014-12-04	2	-22/+161
\| \|\
\| \| *	AAPT: Move private attrs to new type for framework	Adam Lesinski	2014-12-03	2	-22/+161
* \| \|	am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that Random...	Deepanshu Gupta	2014-12-04	2	-38/+34
\|\ \ \ \| \|/ /
\| * \|	am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked."...	Deepanshu Gupta	2014-12-04	2	-38/+34
\| \|\ \
\| \| * \	am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev	Deepanshu Gupta	2014-12-03	2	-38/+34
\| \| \|\ \
\| \| \| * \|	Ensure that RandomAccessFile is not leaked.	Deepanshu Gupta	2014-12-02	2	-38/+34
* \| \| \| \|	am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock re...	Deepanshu Gupta	2014-12-04	10	-108/+333
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev	Deepanshu Gupta	2014-12-04	10	-108/+333
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev	Deepanshu Gupta	2014-12-03	10	-108/+333
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix AnalogClock rendering	Deepanshu Gupta	2014-11-26	10	-108/+333
* \| \| \| \|	am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to ...	Deepanshu Gupta	2014-12-04	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of fb30a783 to lmp-mr1-dev	Deepanshu Gupta	2014-12-04	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-dev	Deepanshu Gupta	2014-12-03	2	-2/+2
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix typos in previous bugfixes.	Deepanshu Gupta	2014-11-20	2	-2/+2
* \| \| \| \|	am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Progu...	Adam Lesinski	2014-12-03	1	-6/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	AAPT: Add pathMotion custom classes to Proguard Keep set	Adam Lesinski	2014-12-02	1	-6/+9
* \| \| \| \|	am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Progu...	Adam Lesinski	2014-12-03	1	-0/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	AAPT: Add custom transition classes to Proguard keep set	Adam Lesinski	2014-12-02	1	-0/+9
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for style...	Deepanshu Gupta	2014-11-21	1	-10/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev	Deepanshu Gupta	2014-11-21	1	-10/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev	Deepanshu Gupta	2014-11-19	1	-10/+1
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "Fix setTextAppearance for styles with dots." into lmp-dev	Deepanshu Gupta	2014-11-19	1	-10/+1
\| \| \| \|\
\| \| \| \| *	Fix setTextAppearance for styles with dots.	Deepanshu Gupta	2014-11-18	1	-10/+1
\| \| * \| \|	am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev	Deepanshu Gupta	2014-11-19	2	-0/+45
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	LayoutLib: Stub AM/PM keycodes in Time Picker.	Deepanshu Gupta	2014-11-18	2	-0/+45
* \| \| \| \|	am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process...	Dianne Hackborn	2014-11-21	2	-1/+14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix issue with call backs from media process.	Dianne Hackborn	2014-11-19	2	-1/+14
* \| \| \| \|	am 537888be: Merge "kill HAVE_LOCALTIME_R"	Yabin Cui	2014-11-13	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	kill HAVE_LOCALTIME_R	Yabin Cui	2014-11-13	1	-2/+2
* \| \| \| \| \|	resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-11-12	1	-1/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Move frameworks/base over to libc++.	Dan Albert	2014-11-12	1	-1/+0
* \| \| \| \| \|	am 32f7a6d8: Merge "Move device admin max screen off timeout to internal inte...	Jeff Brown	2014-11-12	1	-5/+0
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "Move device admin max screen off timeout to internal interface." into ...	Jeff Brown	2014-11-11	1	-5/+0
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Move device admin max screen off timeout to internal interface.	Jeff Brown	2014-11-06	1	-5/+0
* \| \| \| \| \| \|	am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1...	Adam Lesinski	2014-11-11	1	-0/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev	Adam Lesinski	2014-11-11	1	-0/+7
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	AAPT: Ignore densities specified in -c flag	Adam Lesinski	2014-11-10	1	-0/+7
* \| \| \| \| \| \| \|	am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ...	Adam Lesinski	2014-11-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge "Fixing NULL pointer access causing segmentation fault in aapt"	Adam Lesinski	2014-11-11	1	-1/+1
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Fixing NULL pointer access causing segmentation fault in aapt	Jörgen Ekström	2014-11-07	1	-1/+1
* \| \| \| \| \| \| \| \|	am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object anim...	Deepanshu Gupta	2014-11-11	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into l...	Deepanshu Gupta	2014-11-11	2	-1/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev	Deepanshu Gupta	2014-11-11	2	-1/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	Don't skip loading object animator.	Deepanshu Gupta	2014-11-11	2	-1/+2
\| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
* \| \| \| \| \| \| \|	am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: ...	Adam Lesinski	2014-11-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	split-select: fix OSX build	Adam Lesinski	2014-11-10	3	-6/+6
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	am 1521303f: Merge "kill OS_CASE_SENSITIVE"	Yabin Cui	2014-11-11	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|