frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Remove references to apache-http from various documents."	Narayan Kamath	2014-12-12	1	-7/+4
\|\
\| *	Remove references to apache-http from various documents.	Narayan Kamath	2014-12-12	1	-7/+4
* \|	am 6ea9db4b: am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs:...	Joe Fernandez	2014-12-12	1	-5/+5
\|\ \
\| * \	am 81779694: am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basic...	Joe Fernandez	2014-12-12	1	-5/+5
\| \|\ \
\| \| * \	am c9014b6d: am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm update...	Joe Fernandez	2014-12-11	1	-5/+5
\| \| \|\ \
\| \| \| * \	Merge "docs: studio basics haxm updates" into lmp-docs	Joe Fernandez	2014-12-11	1	-5/+5
\| \| \| \|\ \
\| \| \| \| * \|	docs: studio basics haxm updates	Rich Slogar	2014-12-11	1	-5/+5
* \| \| \| \| \|	am 11fc651a: am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs:...	Joe Fernandez	2014-12-12	1	-0/+16
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 07877955: am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform upd...	Joe Fernandez	2014-12-12	1	-0/+16
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 5c518b7f: am b32987ec: am c3daed96: Merge "docs: platform updates for api ...	Joe Fernandez	2014-12-11	1	-0/+16
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs: platform updates for api 21" into lmp-docs	Joe Fernandez	2014-12-11	1	-0/+16
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: platform updates for api 21	Rich Slogar	2014-12-09	1	-0/+16
* \| \| \| \| \| \|	am 4cb6d10d: am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs:...	Joe Fernandez	2014-12-12	1	-0/+28
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| / \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	am e3bac3bc: am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24...	Joe Fernandez	2014-12-12	1	-0/+28
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am b64545c8: am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revision...	Joe Fernandez	2014-12-11	1	-0/+28
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs	Joe Fernandez	2014-12-11	1	-0/+28
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: sdk tools 24.0.1 revisions	Rich Slogar	2014-12-10	1	-0/+28
\| \| \| \| \| \|/ \| \| \| \| \|/\|
\| * \| \| \| \|	am 844af56b: am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug...	Joe Fernandez	2014-12-10	1	-9/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am efab8b6f: am bdd6aabd: am d49977d9: Merge "docs: update debug menu for deb...	Joe Fernandez	2014-12-10	1	-9/+1
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs: update debug menu for debugging-studio" into lmp-docs	Joe Fernandez	2014-12-10	1	-9/+1
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: update debug menu for debugging-studio	Rich Slogar	2014-12-10	1	-9/+1
\| \| \| \| \| \|/ \| \| \| \| \|/\|
* \| \| \| \| \|	am e4e1687d: am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:...	Joe Fernandez	2014-12-10	1	-2/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 5a64a475: am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic ...	Joe Fernandez	2014-12-10	1	-2/+3
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 9727d191: am 534ae165: am 3454091d: Merge "docs:studio basic links" into l...	Joe Fernandez	2014-12-10	1	-2/+3
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs:studio basic links" into lmp-docs	Joe Fernandez	2014-12-10	1	-2/+3
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs:studio basic links	Rich Slogar	2014-12-10	1	-2/+3
\| \| \| \| \| \|/ \| \| \| \| \|/\|
* \| \| \| \| \|	am 835ad716: am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc ...	smain@google.com	2014-12-10	2	-5/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates relat...	smain@google.com	2014-12-10	2	-5/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android...	smain@google.com	2014-12-10	2	-5/+5
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	misc updates related to Android Studio.	smain@google.com	2014-12-09	2	-5/+5
\| \| \| \|/ /
* \| \| \| \|	am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7:...	smain@google.com	2014-12-10	3	-12/+15
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT m...	smain@google.com	2014-12-09	3	-12/+15
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/1866882...	smain@google.com	2014-12-09	3	-12/+15
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	revise ADT migration message	smain@google.com	2014-12-08	3	-12/+15
* \| \| \| \|	resolved conflicts for merge of cf8a8019 to master	smain@google.com	2014-12-10	6	-37/+41
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 1bc5b1b9: am 325af3a6: am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clari...	smain@google.com	2014-12-09	6	-36/+40
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 5d3ea8af: am fe4b4009: am a111eb84: Merge "clarify release notes pages wit...	smain@google.com	2014-12-09	6	-36/+40
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	clarify release notes pages with more specific titles and	smain@google.com	2014-12-08	6	-36/+40
\| \| \| \|/
* \| \| \|	followup conflict fix to Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3	smain@google.com	2014-12-09	1	-1/+0
* \| \| \|	resolved conflicts for merge of bd5098e6 to master	Dmitriy Ivanov	2014-12-09	4	-90/+17
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 7ee7d325: am 664ab723: am aba6a432: am 02cd3a40: am 6ae492e6: changes to d...	smain@google.com	2014-12-09	4	-93/+17
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am aba6a432: am 02cd3a40: am 6ae492e6: changes to deprecate eclipse docs and ...	smain@google.com	2014-12-09	4	-93/+17
\| \| \|\ \ \| \| \| \|/
\| \| \| *	changes to deprecate eclipse docs and update migration guide	smain@google.com	2014-12-08	4	-93/+17
* \| \| \|	am d50390ec: am 17ab7f49: am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5:...	Joe Fernandez	2014-12-09	1	-3/+14
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 17ab7f49: am cdcabe4c: am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs:...	Joe Fernandez	2014-12-08	1	-3/+14
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am d6a66d84: am 6ecc6d59: am 88b8b4a5: Merge "docs: studio revision update 1....	Joe Fernandez	2014-12-08	1	-3/+14
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "docs: studio revision update 1.0" into lmp-docs	Joe Fernandez	2014-12-08	1	-3/+14
\| \| \| \|\
\| \| \| \| *	docs: studio revision update 1.0	Rich Slogar	2014-12-08	1	-3/+14
* \| \| \| \|	am 99253bff: am 53202d01: am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd:...	Rich Slogar	2014-12-09	1	-0/+27
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 53202d01: am 1dfaa3a0: am 78264a4d: am 0039a73b: am b7ef7fcd: Merge "docs:...	Rich Slogar	2014-12-08	1	-0/+27
\| \|\ \ \ \ \| \| \|/ / /