frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 8...	Rich Slogar	2014-12-18	2	-12/+39
\|\
\| *	am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 8...	Rich Slogar	2014-12-18	2	-12/+39
\| \|\
\| \| *	am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2	Rich Slogar	2014-12-18	2	-12/+39
\| \| \|\
\| \| \| *	docs: sdk revision 24.0.2	Rich Slogar	2014-12-17	2	-12/+39
* \| \| \|	am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files re...	Eric Gilmore	2014-12-18	3	-16/+44
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files re...	Eric Gilmore	2014-12-18	3	-16/+44
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs.	Eric Gilmore	2014-12-18	3	-16/+44
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Adding links for the last few files requested by PMs.	Eric Gilmore	2014-12-17	3	-16/+44
* \| \| \|	am 2dbb8e13: am 2448afdb: am 48422283: Merge "make hidden text hidden with ne...	smain@google.com	2014-12-17	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 2448afdb: am 48422283: Merge "make hidden text hidden with negative indent...	smain@google.com	2014-12-17	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 48422283: Merge "make hidden text hidden with negative indent to avoid hor...	smain@google.com	2014-12-17	1	-1/+1
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "make hidden text hidden with negative indent to avoid horizontal scrol...	smain@google.com	2014-12-17	1	-1/+1
\| \| \| \|\
\| \| \| \| *	make hidden text hidden with negative indent to avoid horizontal scroll	smain@google.com	2014-12-17	1	-1/+1
* \| \| \| \|	am ab23dec3: am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs:...	Joe Fernandez	2014-12-17	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am fa7d86a1: am e8ce10da: am 6ff265cc: am df916a89: Merge "docs: studio revis...	Joe Fernandez	2014-12-17	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs	Joe Fernandez	2014-12-17	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "docs: studio revision 21 update" into lmp-docs	Joe Fernandez	2014-12-17	1	-1/+1
\| \| \| \|\ \
\| \| \| \| * \|	docs: studio revision 21 update	Rich Slogar	2014-12-15	1	-1/+1
\| \| * \| \| \|	am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into ...	Joe Fernandez	2014-12-17	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs: studio tools help monkey update" into lmp-docs	Joe Fernandez	2014-12-17	1	-1/+1
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: studio tools help monkey update	Rich Slogar	2014-12-11	1	-1/+1
* \| \| \| \| \| \|	am 09d6ed50: am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs:...	Joe Fernandez	2014-12-17	2	-12/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am a5142ca4: am 85787187: am b8e29d01: am 740436b6: Merge "docs: help-adt lin...	Joe Fernandez	2014-12-17	2	-12/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs	Joe Fernandez	2014-12-17	2	-12/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge "docs: help-adt link updates" into lmp-docs	Joe Fernandez	2014-12-17	2	-12/+2
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	docs: help-adt link updates	Rich Slogar	2014-12-12	2	-12/+2
\| \| \| \| \|/ / /
* \| \| \| \| \| \|	am 91a41ac1: am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs:...	Sarah Maddox	2014-12-16	3	-367/+144
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 99c5ac9e: am 48f9c8e4: am aaa37da8: am a158abe4: Merge "docs: Updates less...	Sarah Maddox	2014-12-16	3	-367/+144
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API train...	Sarah Maddox	2014-12-16	3	-367/+144
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge "docs: Updates lesson 1 of location API training: Get last-known locati...	Sarah Maddox	2014-12-15	3	-367/+144
\| \| \| \|\ \ \ \
\| \| \| \| * \| \| \|	docs: Updates lesson 1 of location API training: Get last-known location.	Sarah Maddox	2014-12-15	3	-367/+144
\| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \|
* \| \| \| \| \| \|	am eb9a4607: am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force ...	smain@google.com	2014-12-16	2	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 1d97aebd: am 9af05a68: am 16d9a037: am 68e6819b: brute force improve sugge...	smain@google.com	2014-12-16	2	-1/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download	smain@google.com	2014-12-16	2	-1/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	brute force improve suggestions for sdk download	smain@google.com	2014-12-15	2	-1/+2
\| \| \| \|/ / /
* \| \| \| \| \|	resolved conflicts for merge of f44fdaed to master	Narayan Kamath	2014-12-16	2	-27/+51
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am ccaf3552: am 57911088: am 895d1694: am 6b8756c3: docs: studio 1.0.1 revisi...	Rich Slogar	2014-12-16	2	-27/+51
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update	Rich Slogar	2014-12-16	2	-27/+51
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	docs: studio 1.0.1 revision update	Rich Slogar	2014-12-12	2	-27/+51
\| \| \| \| \|/ \| \| \| \|/\|
* \| \| \| \|	am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav...	smain@google.com	2014-12-16	6	-40/+40
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am f912c21e: am a01e83b2: am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav...	smain@google.com	2014-12-16	6	-40/+40
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not hig...	smain@google.com	2014-12-16	6	-40/+40
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "fix distribute nav styles. they were not highlighted correctly." into ...	smain@google.com	2014-12-13	6	-40/+40
\| \| \| \|\ \
\| \| \| \| * \|	fix distribute nav styles. they were not highlighted correctly.	smain@google.com	2014-12-10	6	-40/+40
* \| \| \| \| \|	am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator ...	Joe Fernandez	2014-12-16	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 9a0be7d3: am 519fbf3a: am 4234fca6: am 044f3947: Merge "docs: uiautomator ...	Joe Fernandez	2014-12-16	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lm...	Joe Fernandez	2014-12-16	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "docs: uiautomator blog link removal" into lmp-docs	Joe Fernandez	2014-12-13	1	-1/+1
\| \| \| \|\ \ \
\| \| \| \| * \| \|	docs: uiautomator blog link removal	Rich Slogar	2014-12-11	1	-1/+1
\| \| \| \| \| \|/ \| \| \| \| \|/\|
* \| \| \| \| \|	am e33b63fe: am 9a05dee5: am e70cb874: am c59d1d78: Merge "docs: studio basic...	Joe Fernandez	2014-12-16	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / /