frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am b50cea02: resolved conflicts for merge of 1569d61f to master	Filip Gruszczyński	2014-03-06	2	-2/+3
\|\
\| *	resolved conflicts for merge of 1569d61f to master	Filip Gruszczyński	2014-03-05	2	-2/+3
\| \|\
\| \| *	am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev	Filip Gruszczyński	2014-03-06	2	-2/+3
\| \| \|\
\| \| \| *	Set android:descendantFocusability to blocksDescendants for all NumberPicker ...	Filip Gruszczyński	2014-03-05	2	-2/+3
* \| \| \|	am 8a84205a: Merge "Updating wording around PROCESS_INCOMING_CALL."	Santos Cordon	2014-03-05	2	-5/+6
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Updating wording around PROCESS_INCOMING_CALL."	Santos Cordon	2014-03-05	2	-5/+6
\| \|\ \ \
\| \| * \| \|	Updating wording around PROCESS_INCOMING_CALL.	Santos Cordon	2014-03-04	2	-5/+6
* \| \| \| \|	am 9e97fcba: Merge "Add lower density assets for Quantum"	Alan Viverette	2014-03-04	184	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Add lower density assets for Quantum"	Alan Viverette	2014-03-05	184	-0/+0
\| \|\ \ \ \
\| \| * \| \| \|	Add lower density assets for Quantum	Alan Viverette	2014-03-04	184	-0/+0
* \| \| \| \| \|	am 568628dc: Manually merge commit \'2faf28cf\' into master	Will Haldean Brown	2014-03-04	7	-0/+113
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Manually merge commit '2faf28cf' into master	Will Haldean Brown	2014-03-04	7	-0/+113
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-mo...	Will Haldean Brown	2014-03-04	7	-0/+113
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	Add swipe-to-dismiss support to PhoneWindow.	Will Haldean Brown	2014-03-04	7	-0/+113
\| \| * \| \| \|	am d53f7a71: am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contact...	Yorke Lee	2014-03-04	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not availab...	Yorke Lee	2014-03-04	1	-1/+1
\| \| \| \|\ \ \
\| \| \| \| * \ \	am 468e973f: am 81479358: Reword the "Quick contacts not available" string	Yorke Lee	2014-03-04	1	-1/+1
\| \| \| \| \|\ \ \
\| \| \| \| \| * \ \	am 81479358: Reword the "Quick contacts not available" string	Yorke Lee	2014-03-04	1	-1/+1
\| \| \| \| \| \|\ \ \
\| \| \| \| \| \| * \| \|	Reword the "Quick contacts not available" string	Yorke Lee	2014-03-04	1	-1/+1
\| * \| \| \| \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-03-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-03	1	-1/+1
* \| \| \| \| \| \| \| \| \|	am d2c2d0c0: am 177d6bf5: am cad87695: am fad83743: Merge "NumberPicker style...	Filip Gruszczyński	2014-03-03	3	-2/+54
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am 177d6bf5: am cad87695: am fad83743: Merge "NumberPicker style for wearable...	Filip Gruszczyński	2014-03-04	3	-2/+54
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	am fad83743: Merge "NumberPicker style for wearable devices." into klp-modula...	Filip Gruszczyński	2014-03-04	3	-2/+54
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge "NumberPicker style for wearable devices." into klp-modular-dev	Filip Gruszczyński	2014-03-04	3	-2/+54
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \|	NumberPicker style for wearable devices.	Filip Gruszczyński	2014-03-03	3	-2/+54
* \| \| \| \| \| \| \| \| \|	am 9be7887b: Merge "Quantum for seek bars, spinners, switches"	Alan Viverette	2014-03-03	48	-113/+596
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge "Quantum for seek bars, spinners, switches"	Alan Viverette	2014-03-04	48	-113/+596
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Quantum for seek bars, spinners, switches	Alan Viverette	2014-03-03	48	-113/+596
* \| \| \| \| \| \| \| \| \|	am a4eeb0dc: am bc8301df: am 0054ed81: am 8bb3b8f8: am 95cf532f: am 26de0b71:...	Dirk Dougherty	2014-03-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am bc8301df: am 0054ed81: am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb:...	Dirk Dougherty	2014-03-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| / / / / / / / \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission ...	Dirk Dougherty	2014-03-03	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description s...	Dirk Dougherty	2014-03-03	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / \| \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \| \|	am 26de0b71: am cce121fb: Merge "Update permission description string." into ...	Dirk Dougherty	2014-03-03	1	-1/+1
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \|_\|/ / \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| * \| \| \|	am cce121fb: Merge "Update permission description string." into klp-docs	Dirk Dougherty	2014-03-03	1	-1/+1
\| \| \| \| \| \|\ \ \ \
\| \| \| \| \| \| * \| \| \|	Update permission description string.	Dirk Dougherty	2014-03-03	1	-1/+1
\| \| * \| \| \| \| \| \| \|	am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotF...	Jay Shrauner	2014-03-03	2	-2/+7
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException...	Jay Shrauner	2014-03-03	2	-2/+7
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / /
\| \| \| \| * \| \| \| \| \|	am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick con...	Jay Shrauner	2014-03-03	2	-2/+7
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|/ / / / /
\| \| \| \| \| * \| \| \| \|	am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" ...	Jay Shrauner	2014-03-03	2	-2/+7
\| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \|_\|_\|/ \| \| \| \| \| \| \|/\| \| \|
\| \| \| \| \| \| * \| \| \|	Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev	Jay Shrauner	2014-03-03	2	-2/+7
\| \| \| \| \| \| \|\ \ \ \
\| \| \| \| \| \| \| * \| \| \|	Catch ActivityNotFoundException in quick contacts badge	Yorke Lee	2014-03-01	2	-2/+7
\| \| * \| \| \| \| \| \| \| \|	am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PA...	rich cannings	2014-03-03	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / /
\| \| \| * \| \| \| \| \| \| \|	am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signa...	rich cannings	2014-03-03	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| / / \| \| \| \| \|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature\|system""...	rich cannings	2014-03-03	1	-1/+1
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|/ / / / /
\| \| \| \| \| * \| \| \| \|	am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature\|system"" into klp-dev	rich cannings	2014-03-03	1	-1/+1
\| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \|/ / / /
\| \| \| \| \| \| * \| \| \|	Make FORCE_STOP_PACKAGES "signature\|system"	rich cannings	2014-02-24	1	-1/+1
\| \| \| \| \| \| \|/ / /
\| \| \| \| \| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-02-19	13	-47/+47
\| \| \| \| \| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-01-06	2	-4/+4
\| \| \| \| \| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-12-30	1	-1/+1