frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflices for merge of 93ccd1a2 to master	Dirk Dougherty	2014-05-14	6	-486/+499
\|\
\| *	am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distri...	Dirk Dougherty	2014-05-14	6	-3/+14
\| \|\
\| \| *	am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.	Dirk Dougherty	2014-05-14	6	-3/+14
\| \| \|\
\| \| \| *	Doc change: Updated content for distribute.	Dirk Dougherty	2014-05-14	6	-3/+14
* \| \| \|	am 0932eb35: am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some not...	Robert Ly	2014-05-10	1	-4/+103
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification cod...	Robert Ly	2014-05-10	1	-4/+103
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear st...	Robert Ly	2014-05-10	1	-4/+103
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "docs: fix some notification code for wear stacks" into klp-docs	Robert Ly	2014-05-10	1	-4/+103
\| \| \| \|\
\| \| \| \| *	docs: fix some notification code for wear stacks	Robert Ly	2014-05-09	1	-4/+103
* \| \| \| \|	am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented ho...	Andrew Solovay	2014-05-09	1	-0/+21
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set noti...	Andrew Solovay	2014-05-09	1	-0/+21
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification prio...	Andrew Solovay	2014-05-09	1	-0/+21
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "doc: Documented how to set notification priority." into klp-docs	Andrew Solovay	2014-05-09	1	-0/+21
\| \| \| \|\ \
\| \| \| \| * \|	doc: Documented how to set notification priority.	Andrew Solovay	2014-05-08	1	-0/+21
\| \| \| \| \|/
\| * \| \| \|	am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.	Eino-Ville Talvala	2014-05-09	1	-4/+9
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	DO NOT MERGE: Add android.hardware.camera.external feature.	Eino-Ville Talvala	2014-05-08	1	-4/+9
* \| \| \| \|	Add android.hardware.camera.external feature.	Eino-Ville Talvala	2014-05-08	1	-3/+8
* \| \| \| \|	am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data ...	Scott Main	2014-05-07	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wron...	Scott Main	2014-05-06	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s ...	Scott Main	2014-05-06	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	fix code error.	Scott Main	2014-05-06	1	-1/+1
\| \| \| \|/
* \| \| \|	am 86318b7d: am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line...	David Friedman	2014-04-28	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broke...	David Friedman	2014-04-28	1	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: ...	David Friedman	2014-04-28	1	-2/+2
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Fixed missing line break, broken link.	David Friedman	2014-04-25	1	-2/+2
* \| \| \|	am 9a4db311: am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Back...	Andrew Solovay	2014-04-24	1	-2/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' ...	Andrew Solovay	2014-04-24	1	-2/+3
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu.	Andrew Solovay	2014-04-24	1	-2/+3
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Correcting name of 'Backup & reset' menu.	Andrew Solovay	2014-04-24	1	-2/+3
* \| \| \|	am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample ...	Andrew Solovay	2014-04-23	1	-5/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standa...	Andrew Solovay	2014-04-23	1	-5/+9
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. A...	Andrew Solovay	2014-04-23	1	-5/+9
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Doc: Fixed a code sample to use standard methods. Also some formatting	Andrew Solovay	2014-04-22	1	-5/+9
* \| \| \|	am 97b7208f: am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sa...	Andrew Solovay	2014-04-22	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample.	Andrew Solovay	2014-04-22	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am c68e2089: am 3555e4ae: Fixed a typo in a code sample.	Andrew Solovay	2014-04-22	1	-1/+1
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Fixed a typo in a code sample.	Andrew Solovay	2014-04-22	1	-1/+1
* \| \| \|	am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the pl...	Ricardo Cervera	2014-04-18	1	-0/+243
\|\ \ \ \ \| \|/ / /
\| * \| \|	am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from searc...	Ricardo Cervera	2014-04-18	1	-0/+243
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug...	Ricardo Cervera	2014-04-18	1	-0/+243
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs	Ricardo Cervera	2014-04-18	1	-0/+243
\| \| \| \|\
\| \| \| \| *	docs: Added the play from search intent. Bug: 13473141.	Ricardo Cervera	2014-04-17	1	-0/+243
* \| \| \| \|	am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...	John Spurlock	2014-04-04	1	-1/+3
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...	John Spurlock	2014-04-04	1	-1/+3
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Introduce new UI_MODE_TYPE_WATCH and qualifier.	John Spurlock	2014-04-04	1	-1/+3
* \| \| \| \|	am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRoutePr...	Katie McCormick	2014-04-03	3	-17/+479
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Develo...	Katie McCormick	2014-04-02	3	-17/+479
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" in...	Katie McCormick	2014-04-02	3	-17/+479
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	docs: MediaRouteProvider Developer Guide	Joe Fernandez	2014-04-02	3	-17/+479
\| \| \| \|/
* \| \| \|	am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to ...	Scott Main	2014-04-01	1	-6/+305
\|\ \ \ \ \| \|/ / /