frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev	Ricardo Cervera	2015-01-16	1	-1/+3
\|\
\| *	resolved conflicts for merge of e8f6bd48 to lmp-dev	Ricardo Cervera	2015-01-16	1	-1/+3
\| \|\
\| \| *	am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(...	Ricardo Cervera	2015-01-16	1	-1/+3
\| \| \|\
\| \| \| *	docs: Added info on noHistory and onActivityResult(). Bug: 13807256	Ricardo Cervera	2014-11-05	1	-1/+3
* \| \| \|	resolved conflicts for merge of ea0137ef to lmp-mr1-dev	Scott Rowe	2015-01-06	1	-14/+14
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Checklist for TV Apps	Scott Rowe	2015-01-05	1	-14/+14
* \| \| \|	Revert "Camera: Add new capability flags as system features as well"	Eino-Ville Talvala	2014-12-03	1	-9/+1
* \| \| \|	Camera: Add new capability flags as system features as well	Eino-Ville Talvala	2014-11-20	1	-1/+25
\|/ / /
* \| \|	docs: b/18119632 isGame, b/18119595 banner	Scott Rowe	2014-10-31	2	-72/+126
* \| \|	Doc change: Add Lollipop to platform versions table.	Dirk Dougherty	2014-10-17	1	-0/+11
* \| \|	docs: Recents screen for tasks and activities	Scott Rowe	2014-10-16	1	-9/+92
* \| \|	am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navig...	Andrew Solovay	2014-07-21	1	-1/+17
\|\ \ \
\| * \ \	am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into ...	Andrew Solovay	2014-07-21	1	-1/+17
\| \|\ \ \ \| \| \|/ /
\| \| * \|	docs: Noted how singleTop affects "up" navigation.	Andrew Solovay	2014-07-11	1	-1/+17
* \| \| \|	am 0f59f9e7: am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989"	Nick Kralevich	2014-07-05	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 3b4c2c98: am 63af727b: Merge "Fix Issue 59989"	Nick Kralevich	2014-07-05	1	-1/+1
\| \|\ \ \
\| \| * \ \	Merge "Fix Issue 59989"	Nick Kralevich	2014-07-02	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Fix Issue 59989	Paul Quei	2013-09-12	1	-1/+1
\| \| * \| \| \|	am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."	Elliott Hughes	2014-03-08	1	-1/+1
\| \| \|\ \ \ \
* \| \| \ \ \ \	am 8312bfd6: am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev	Robert Ly	2014-06-18	1	-1/+13
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev	Robert Ly	2014-06-18	1	-1/+13
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	docs: add allowembedded	Robert Ly	2014-06-18	1	-1/+13
* \| \| \| \| \| \|	resolved conflices for merge of 93ccd1a2 to master	Dirk Dougherty	2014-05-14	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distri...	Dirk Dougherty	2014-05-14	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.	Dirk Dougherty	2014-05-14	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| \| \| * \| \| \|	Doc change: Updated content for distribute.	Dirk Dougherty	2014-05-14	1	-1/+1
\| * \| \| \| \| \|	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 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
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Fixed missing line break, broken link.	David Friedman	2014-04-25	1	-2/+2
\| \| \|/ / /
* \| \| \| \|	am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous smal...	Elliott Hughes	2014-02-21	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."	Elliott Hughes	2014-02-21	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| / / \| \| \|/ /
\| \| * \|	Miscellaneous small documentation fixes.	Mark Doliner	2014-01-03	1	-1/+1
* \| \| \|	Merge commit '47d3eaf6' into manualmerge	Dirk Dougherty	2014-02-12	27	-31/+31
\|\ \ \ \ \| \|/ / /
\| * \| \|	Doc change: minor edits to support easier extraction of document summaries.	Dirk Dougherty	2014-02-12	27	-31/+31
* \| \| \|	am d3417283: am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa:...	Ricardo Cervera	2014-02-12	1	-14/+42
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Added missing elements in uses-feature. Bug: 12913153	Ricardo Cervera	2014-02-07	1	-14/+42
* \| \| \|	am 2bcc0782: am ee1b0bfd: am 9714cbdf: am 21627274: am cc29a170: Merge "docs:...	quddusc	2014-01-14	2	-1/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Added missing links pointing to parent containers for <meta-data> manif...	quddusc	2014-01-06	2	-1/+4
* \| \| \|	am ae9702bb: am ac4ebda9: am f16ddd6d: am 2a191297: am cbc5f541: Merge "docs:...	quddusc	2013-12-26	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Added a statement for "android:name" attribute indicating that the desc...	quddusc	2013-12-20	1	-1/+1
* \| \| \|	am aea9c66b: am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs:...	quddusc	2013-12-26	1	-3/+7
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Added missing elements under "can contain:" list in manifest-element.html.	quddusc	2013-12-20	1	-3/+7
* \| \| \|	am c797221f: am 64d14b5c: am 37826fa9: am 4e73847a: am 5cdadb48: initial shuf...	Scott Main	2013-12-17	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	initial shuffle of the API guide nav to add introduction	Scott Main	2013-12-17	1	-1/+1
* \| \| \|	am 5f41b262: am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite inte...	Scott Main	2013-12-11	2	-70/+85
\|\ \ \ \ \| \|/ / /
\| * \| \|	rewrite intent guide and add doc with intents supported by platform apps	Scott Main	2013-12-10	2	-70/+85
* \| \| \|	am c7b3fc84: am 34faa40c: am 1df855a4: am f31d9151: am cdac3b1e: Merge "docs:...	Joe Fernandez	2013-12-10	1	-11/+11
\|\ \ \ \ \| \|/ / /