frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in andro...	Andrew Solovay	2015-04-02	1	-4/+5
\|\
\| *	docs: Fixed formatting in android:documentLaunchMode syntax section	Andrew Solovay	2015-03-31	1	-4/+5
* \|	am 93ffb863: am b489a6d1: am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5:...	Andrew Solovay	2015-03-19	1	-2/+2
\|\ \ \| \|/
\| *	am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quot...	Andrew Solovay	2015-03-19	1	-2/+2
\| \|\
\| \| *	docs: Fixed typo (spurious quotation mark).	Andrew Solovay	2015-03-13	1	-2/+2
* \| \|	am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation...	Brian Carlstrom	2015-03-17	1	-1/+5
\|\ \ \ \| \|/ /
\| * \|	Merge "Update vmSafeMode documentation" into lmp-mr1-dev	Brian Carlstrom	2015-03-17	1	-1/+5
\| \|\ \
\| \| * \|	Update vmSafeMode documentation	Brian Carlstrom	2015-03-09	1	-1/+5
* \| \| \|	am 5be1afed: am 7151b1ef: am 98560bdf: am bfcc60a3: am 2825a9c6: am 470ad0fa:...	Craig Mautner	2015-03-13	1	-2/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	am bfcc60a3: am 2825a9c6: am 470ad0fa: Merge "Correct docs to specify leading...	Craig Mautner	2015-03-13	1	-2/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/
\| \| *	Correct docs to specify leading slash in paths.	Craig Mautner	2015-03-10	1	-2/+3
\| \| *	docs: Added info on noHistory and onActivityResult().	Ricardo Cervera	2015-01-16	1	-1/+3
* \| \|	am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the us...	Joe Fernandez	2015-03-03	1	-2/+7
\|\ \ \ \| \|/ /
\| * \|	docs: Add Android 5.1 to the uses-sdk manifest docs	Joe Fernandez	2015-03-02	1	-2/+7
* \| \|	am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for me...	Ricardo Cervera	2015-01-16	1	-1/+3
\|\ \ \ \| \|/ /
\| * \|	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
* \| \| \| \|	am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to ...	Joe Fernandez	2015-01-07	1	-14/+14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
* \| \| \| \|	am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as ...	Eino-Ville Talvala	2014-12-04	1	-9/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Revert "Camera: Add new capability flags as system features as well"	Eino-Ville Talvala	2014-12-03	1	-9/+1
* \| \| \| \|	am e289082a: am dfa99f63: Merge "Camera: Add new capability flags as system f...	Eino-Ville Talvala	2014-11-24	1	-1/+25
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Camera: Add new capability flags as system features as well	Eino-Ville Talvala	2014-11-20	1	-1/+25
\| \|/ / /
* \| \| \|	am 1117098b: am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 i...	Scott Rowe	2014-11-03	2	-72/+126
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: b/18119632 isGame, b/18119595 banner	Scott Rowe	2014-10-31	2	-72/+126
* \| \| \|	am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lo...	Dirk Dougherty	2014-10-17	1	-0/+11
\|\ \ \ \ \| \|/ / /
\| * \| \|	Doc change: Add Lollipop to platform versions table.	Dirk Dougherty	2014-10-17	1	-0/+11
* \| \| \|	am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents scre...	Joe Fernandez	2014-10-17	1	-9/+92
\|\ \ \ \ \| \|/ / /
\| * \| \|	docs: Recents screen for tasks and activities	Scott Rowe	2014-10-16	1	-9/+92
* \| \| \|	resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp	Elliott Hughes	2014-09-08	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Small documentation fixes across many files.	Mark Doliner	2014-09-05	1	-2/+2
* \| \| \|	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
\| \|\ \ \ \ \ \ \| \| \|/ / / / /