frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	fix back link for preview nav	smain@google.com	2014-06-25	1	-3/+3
*	Merge "docs: add gcore instructions for preview" into klp-modular-dev	Robert Ly	2014-06-25	1	-0/+18
\|\
\| *	docs: add gcore instructions for preview	Robert Ly	2014-06-25	1	-0/+18
* \|	Merge "add license wall to downloading the L Preview system images" into klp-...	smain@google.com	2014-06-25	1	-13/+233
\|\ \
\| * \|	add license wall to downloading the L Preview system images	smain@google.com	2014-06-25	1	-13/+233
\| \|/
* \|	Merge "Final L-Preview Guidelines for Android TV Games Staged at http://boku....	Joe Fernandez	2014-06-25	1	-53/+135
\|\ \
\| * \|	Final L-Preview Guidelines for Android TV Games	David Friedman	2014-06-24	1	-53/+135
* \| \|	am 80c07fb9: am ec6f162f: DO NOT MERGE!	smain@google.com	2014-06-25	1	-1/+1
\|\ \ \
\| * \ \	am ec6f162f: DO NOT MERGE!	smain@google.com	2014-06-25	1	-1/+1
\| \|\ \ \
\| \| * \| \|	DO NOT MERGE!	smain@google.com	2014-06-25	1	-1/+1
* \| \| \| \|	am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE!	smain@google.com	2014-06-25	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 53126416: DO NOT MERGE!	smain@google.com	2014-06-25	9	-977/+79
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	DO NOT MERGE!	smain@google.com	2014-06-25	9	-977/+79
\| * \| \| \|	am 4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google...	Scott Main	2014-06-25	11	-0/+7711
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	DO NOT MERGE	Scott Main	2014-06-25	11	-0/+7711
* \| \| \| \|	am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for goog...	Scott Main	2014-06-25	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 87670bcb: Revert "add \'coming soon\' page for google io announcements"	Scott Main	2014-06-25	11	-7711/+0
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Revert "add 'coming soon' page for google io announcements"	Scott Main	2014-06-25	11	-7711/+0
* \| \| \| \|	am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io an...	smain@google.com	2014-06-25	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am cca2a91a: add \'coming soon\' page for google io announcements	smain@google.com	2014-06-25	11	-0/+7711
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	add 'coming soon' page for google io announcements	smain@google.com	2014-06-24	11	-0/+7711
* \| \| \| \|	Merge "fix build" into klp-modular-dev	Robert Ly	2014-06-25	1	-1/+0
\|\ \ \ \ \
\| * \| \| \| \|	fix build	Robert Ly	2014-06-25	1	-1/+0
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge "Import translations. DO NOT MERGE" into klp-modular-dev	Baligh Uddin	2014-06-25	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-06-25	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-06-25	5	-7/+7
\|/ / / /
* \| \| \|	Merge "docs:wear landing and training fixes" into klp-modular-dev	Robert Ly	2014-06-25	22	-33/+35
\|\ \ \ \
\| * \| \| \|	docs:wear landing and training fixes	Robert Ly	2014-06-25	22	-33/+35
* \| \| \| \|	docs: Updated Renault logo on the Auto site	Ricardo Cervera	2014-06-24	2	-18/+15
\|/ / / /
* \| \| \|	Merge "Android TV Landing page, final (probably)" into klp-modular-dev	Joe Fernandez	2014-06-25	6	-60/+35
\|\ \ \ \
\| * \| \| \|	Android TV Landing page, final (probably)	Joe Fernandez	2014-06-24	6	-60/+35
* \| \| \| \|	fix samples page	Robert Ly	2014-06-24	1	-36/+10
* \| \| \| \|	Merge "docs: wear training classes" into klp-modular-dev	Robert Ly	2014-06-24	22	-659/+2460
\|\ \ \ \ \
\| * \| \| \| \|	docs: wear training classes	Robert Ly	2014-06-24	22	-659/+2460
* \| \| \| \| \|	Merge "docs: add gms core hoop jumping" into klp-modular-dev	Robert Ly	2014-06-24	2	-43/+31
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	docs: add gms core hoop jumping	Robert Ly	2014-06-24	2	-43/+31
* \| \| \| \| \|	Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev	Joe Fernandez	2014-06-23	2	-10/+7
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	docs: Fixes for Android TV Dev Guide	Joe Fernandez	2014-06-24	2	-10/+7
* \| \| \| \| \|	Merge "docs: Added descriptions of the l-preview samples." into klp-modular-dev	Robert Ly	2014-06-24	7	-1/+244
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	docs: Added descriptions of the l-preview samples.	Andrew Solovay	2014-06-24	7	-1/+244
* \| \| \| \| \|	docs: Removing mercedes logo from auto site	Ricardo Cervera	2014-06-24	2	-8/+8
* \| \| \| \| \|	Merge "Android TV Design Guidelines" into klp-modular-dev	Joe Fernandez	2014-06-24	23	-216/+198
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Android TV Design Guidelines	Joe Fernandez	2014-06-24	23	-216/+198
* \| \| \| \| \| \|	Merge "docs: Updated L Preview Highlights (hopefully final)." into klp-modula...	Quddus Chong	2014-06-24	1	-54/+47
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	docs: Updated L Preview Highlights (hopefully final).	Quddus Chong	2014-06-24	1	-54/+47
* \| \| \| \| \| \| \|	Merge "docs: Last minute eng feedback piece on L preview docs" into klp-modul...	Ricardo Cervera	2014-06-24	1	-0/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	docs: Last minute eng feedback piece on L preview docs	Ricardo Cervera	2014-06-24	1	-0/+3
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge "docs: Noted that ADT require Java 7 for L dev preview." into klp-modul...	Robert Ly	2014-06-24	1	-1/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	docs: Noted that ADT require Java 7 for L dev preview.	Andrew Solovay	2014-06-24	1	-0/+3
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge "docs: Adding Create a Project instructions for L preview." into klp-mo...	Robert Ly	2014-06-24	1	-11/+27
\|\ \ \ \ \ \ \ \