frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" re...	Scott Main	2013-08-12	9	-1430/+2785
*	Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev"	Scott Main	2013-08-12	9	-2785/+1430
*	resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev	Katie McCormick	2013-08-09	9	-1430/+2785
\|\
\| *	Doc change: collapse key fix.	Katie McCormick	2013-08-09	9	-1429/+2784
* \|	Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs	Dirk Dougherty	2013-08-01	1	-69/+0
\|\ \
\| * \|	Doc Update: Delete this unpublished cruft.	Katie McCormick	2013-08-01	1	-69/+0
* \| \|	fix misc broken links	Scott Main	2013-08-01	3	-4/+4
\|/ /
* \|	Doc change: edits to purchase status api docs.	Dirk Dougherty	2013-07-31	1	-7/+8
* \|	Revert "docs: add link to developer survey on main landing pages"	Scott Main	2013-07-30	2	-16/+0
* \|	Doc change: fix typo.	Dirk Dougherty	2013-07-28	1	-1/+1
* \|	update all links to the support library	Scott Main	2013-07-23	1	-3/+3
\|/
*	am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service k...	Scott Main	2013-07-09	1	-1/+1
\|\
\| *	am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 88343...	Scott Main	2013-07-09	1	-1/+1
\| \|\
\| \| *	Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev	Scott Main	2013-07-09	1	-1/+1
\| \| \|\
\| \| \| *	update url for backup service key	Scott Main	2013-07-09	1	-1/+1
* \| \| \|	am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer sur...	Dirk Dougherty	2013-07-09	2	-0/+16
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main l...	Dirk Dougherty	2013-07-09	2	-0/+16
\| \|\ \ \ \| \| \|/ /
\| \| * \|	docs: add link to developer survey on main landing pages	Scott Main	2013-07-08	2	-0/+16
\| \| \|/
* \| \|	am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: ...	Dirk Dougherty	2013-06-12	5	-90/+178
\|\ \ \ \| \|/ /
\| * \|	am 94e207b9: am 3574bef4: am 47f5c410: am 57bb89f0: Doc change: Add docs for ...	Dirk Dougherty	2013-06-12	5	-90/+178
\| \|\ \ \| \| \|/
\| \| *	am 47f5c410: am 57bb89f0: Doc change: Add docs for GP Purchase Status API.	Dirk Dougherty	2013-06-12	5	-90/+178
\| \| \|\
\| \| \| *	Doc change: Add docs for GP Purchase Status API.	Dirk Dougherty	2013-06-12	5	-90/+178
* \| \| \|	am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc u...	kmccormick	2013-06-05	10	-500/+512
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refact...	kmccormick	2013-06-05	10	-500/+512
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." i...	kmccormick	2013-06-05	10	-500/+512
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Doc update: Refactoring to client/server.	kmccormick	2013-06-05	10	-500/+512
* \| \| \|	am 40f8668a: am ca725a1a: am 92ff5862: Merge "clean up the results for \'andr...	Scott Main	2013-05-29	2	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	am ca725a1a: am 92ff5862: Merge "clean up the results for \'android\' in sear...	Scott Main	2013-05-29	2	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "clean up the results for 'android' in search suggestions" into jb-mr1....	Scott Main	2013-05-29	2	-2/+2
\| \| \|\ \
\| \| \| * \|	clean up the results for 'android' in search suggestions	Scott Main	2013-05-23	2	-2/+2
* \| \| \| \|	am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to includ...	Scott Main	2013-05-28	1	-31/+49
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator su...	Scott Main	2013-05-28	1	-31/+49
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	update GPS setup page to include emulator support.	Scott Main	2013-05-24	1	-31/+49
\| \| \|/ /
* \| \| \|	am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc u...	kmccormick	2013-05-23	1	-0/+9
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GC...	kmccormick	2013-05-23	1	-0/+9
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs	kmccormick	2013-05-23	1	-0/+9
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs	kmccormick	2013-05-23	1	-0/+9
\| \| \| \|\
\| \| \| \| *	Doc update: fix GCM TOC	kmccormick	2013-05-22	1	-0/+9
* \| \| \| \|	am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc c...	Dirk Dougherty	2013-05-21	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix do...	Dirk Dougherty	2013-05-21	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs	Dirk Dougherty	2013-05-21	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "Doc change: fix doc title." into jb-mr1.1-docs	Dirk Dougherty	2013-05-21	1	-1/+1
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| \| *	Doc change: fix doc title.	Dirk Dougherty	2013-05-21	1	-1/+1
* \| \| \| \|	am 997d0042: am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualm...	Dirk Dougherty	2013-05-15	1	-7/+14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am aa0acfc8: am 231e2474: Merge commit \'c3069c26\' into manualmerge	Dirk Dougherty	2013-05-15	1	-7/+14
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge commit 'c3069c26' into manualmerge	Dirk Dougherty	2013-05-15	1	-7/+14
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Doc change: updates to location landing.	Dirk Dougherty	2013-05-15	1	-7/+14
\| \| \| \|/
* \| \| \|	am 78d38908: am f2216fd0: am 527b7623: more search suggest tagging	Scott Main	2013-05-15	3	-2/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	am f2216fd0: am 527b7623: more search suggest tagging	Scott Main	2013-05-15	3	-2/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	more search suggest tagging	Scott Main	2013-05-15	3	-2/+4