frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "resolved conflicts for merge of b6d6c04a to master"	Andreas Gampe	2015-03-11	1	-3/+3
\|\
\| *	resolved conflicts for merge of b6d6c04a to master	Andreas Gampe	2015-03-10	1	-3/+3
\| \|\
\| \| *	am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to in...	Andreas Gampe	2015-03-10	1	-3/+3
\| \| \|\
\| \| \| *	am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"	Andreas Gampe	2015-03-10	1	-3/+3
\| \| \| \|\
\| \| \| \| *	Merge "Frameworks/base: Pass APK debugability to installd"	Andreas Gampe	2015-03-09	1	-3/+3
\| \| \| \| \|\
\| \| \| \| \| *	Frameworks/base: Pass APK debugability to installd	Andreas Gampe	2015-03-09	1	-3/+3
* \| \| \| \| \|	Merge "Notify TrustAgentService when device policy configuration no longer ap...	Adrian Roos	2015-03-11	1	-6/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Notify TrustAgentService when device policy configuration no longer applies	Adrian Roos	2015-03-09	1	-6/+8
* \| \| \| \| \| \|	Merge "Add Phone.ENTERPRISE_CONTENT_URI"	Ricky Wai	2015-03-10	1	-0/+23
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add Phone.ENTERPRISE_CONTENT_URI	Ricky Wai	2015-03-04	1	-0/+23
* \| \| \| \| \| \|	Merge "Add several CallSupers to View"	Chris Craik	2015-03-10	1	-0/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add several CallSupers to View	Chris Craik	2015-03-10	1	-0/+6
* \| \| \| \| \| \| \|	Remove unused settings constants from the SDK (framework).	Svetoslav	2015-03-10	1	-18/+19
* \| \| \| \| \| \| \|	am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsole...	dcashman	2015-03-10	1	-148/+22
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security c...	dcashman	2015-03-09	1	-148/+22
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	am c7446790: Merge "ZygoteConnection: remove obsolete security checks."	dcashman	2015-03-09	1	-148/+22
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \|	Merge "ZygoteConnection: remove obsolete security checks."	dcashman	2015-03-09	1	-148/+22
\| \| \| \|\ \ \ \ \
\| \| \| \| * \| \| \| \|	ZygoteConnection: remove obsolete security checks.	dcashman	2015-03-09	1	-148/+22
\| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \|
* \| \| \| \| \| \| \|	Merge "Do not show toast when forwarding from resolver activity to itself."	Sander Alewijnse	2015-03-10	1	-0/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Do not show toast when forwarding from resolver activity to itself.	Sander Alewijnse	2015-03-10	1	-0/+3
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge "Cache photo URI too in calllog (contract)"	Makoto Onuki	2015-03-10	1	-0/+8
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Cache photo URI too in calllog (contract)	Makoto Onuki	2015-03-09	1	-0/+8
* \| \| \| \| \| \| \| \|	Merge "Handle undo in TextView fields with no cursor"	James Cook	2015-03-10	1	-2/+3
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Handle undo in TextView fields with no cursor	James Cook	2015-03-10	1	-2/+3
* \| \| \| \| \| \| \| \| \|	Merge "Revert RelativeLayout's baseline view to API 22 and below behavior"	Alan Viverette	2015-03-10	1	-15/+31
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Revert RelativeLayout's baseline view to API 22 and below behavior	Alan Viverette	2015-03-09	1	-15/+31
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge "resolved conflicts for merge of 7545accf to master"	Elliott Hughes	2015-03-10	2	-6/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	resolved conflicts for merge of 7545accf to master	Elliott Hughes	2015-03-10	2	-6/+8
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| / / / / / / \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API."	Elliott Hughes	2015-03-09	2	-5/+7
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	am 63d43949: Merge "Use the icu:: namespace for icu4c API."	Elliott Hughes	2015-03-09	2	-5/+7
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \|/ / / / \| \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \| \|	Merge "Use the icu:: namespace for icu4c API."	Elliott Hughes	2015-03-09	2	-5/+7
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|/ / / \| \| \| \| \|/\| \| \| \|
\| \| \| \| \| * \| \| \|	Use the icu:: namespace for icu4c API.	Elliott Hughes	2015-03-07	2	-5/+7
* \| \| \| \| \| \| \| \|	Merge "Rename and simplify DisplayList Canvas classes"	Chris Craik	2015-03-10	9	-135/+102
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename and simplify DisplayList Canvas classes	Chris Craik	2015-03-09	9	-135/+102
* \| \| \| \| \| \| \| \|	Merge "Document behavior change of isUninstallBlocked() since L MR1"	Rubin Xu	2015-03-10	1	-1/+6
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Document behavior change of isUninstallBlocked() since L MR1	Rubin Xu	2015-03-10	1	-1/+6
* \| \| \| \| \| \| \| \| \|	Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth control...	Adam Lesinski	2015-03-10	5	-225/+582
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	BatteryStats: Record energy info stats from WiFi and Bluetooth controllers	Adam Lesinski	2015-03-09	5	-225/+582
* \| \| \| \| \| \| \| \| \| \|	Merge "Fix: Drag handles are not shown for selection/insertion"	Roozbeh Pournader	2015-03-10	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Fix: Drag handles are not shown for selection/insertion	Keisuke Kuroyanagi	2015-02-27	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Copy ViewPager and PagerAdapter into framework-internal widgets"	Alan Viverette	2015-03-10	2	-0/+3186
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Copy ViewPager and PagerAdapter into framework-internal widgets	Alan Viverette	2015-03-09	2	-0/+3186
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Add DEPTH image formats, support in ImageReader	Eino-Ville Talvala	2015-03-09	1	-0/+94
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Camera2: Add hidden depth stream configuration tags"	Eino-Ville Talvala	2015-03-09	1	-0/+77
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Camera2: Add hidden depth stream configuration tags	Eino-Ville Talvala	2015-03-09	1	-0/+77
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream"	Eino-Ville Talvala	2015-03-09	3	-5/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Camera2: Remove unused parameters in ICameraDeviceUser#createStream	Eino-Ville Talvala	2015-03-09	3	-5/+3
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Make TypedArray and LayoutInflater exceptions more useful"	Alan Viverette	2015-03-09	2	-11/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make TypedArray and LayoutInflater exceptions more useful	Alan Viverette	2015-03-09	2	-11/+25
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Change WiFi and Bluetooth ActivityEnergyInfo classes	Adam Lesinski	2015-03-09	1	-9/+12
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|