179489 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joe Fernandez	8109599b1c	am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs ... * commit 'e7558b44f707979cb4f85b0ccd0862b9ea068ee6': docs: studio workflow links	2015-01-06 02:26:32 +00:00
Joe Fernandez	1779fd1514	am d1489d5d: am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs ... * commit 'd1489d5db00d030b873fe84f32fa5bd453152824': docs: studio tips and ticks grammmar typo	2015-01-06 02:26:25 +00:00
Ricardo Cervera	02819090ec	am 4d4b599d: am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs ... * commit '4d4b599d7c864d44267979fa71ca5b0bb27171b5': docs: Update wearable lists docs	2015-01-06 02:26:18 +00:00
Joe Fernandez	66a49d994c	am bea6f1e6: am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs ... * commit 'bea6f1e6457841b8be4e45ecb713762894799f7a': docs: studio device emulator updates	2015-01-06 02:26:11 +00:00
Sarah Maddox	d259fb3757	am 73c943fc: am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs ... * commit '73c943fc71bbb35bd494b24cc649eaa168f3c1e5': docs: Updates the request-location-updates lesson in the location APIs training course.	2015-01-06 02:26:05 +00:00
Ricardo Cervera	2d90b49ad2	am fd731d4b: am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs ... * commit 'fd731d4bebed075f1c1d4130c22dbb7475ec8efe': docs: Adding vector drawables video	2015-01-06 02:25:58 +00:00
Joe Fernandez	4d0c931be7	am 5ec2afea: am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs ... * commit '5ec2afea01be51e5607e445c401be3296f1ac83e': docs: plugin reference update	2015-01-06 02:25:47 +00:00
Andrew Solovay	eeaf280dc7	am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc ... * commit 'ff62a5eea743581dd0747026f09f3d73cdd4c1ea': docs: New "app compatibility with managed profiles" doc	2015-01-06 02:12:48 +00:00
Joe Fernandez	c632031af3	am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs ... * commit '27195338192b63b62f274f11bcae57dc2788514f': docs: studio build output dir name update	2015-01-06 02:12:43 +00:00
Joe Fernandez	06cdc2fd64	am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs ... * commit '851931f0626c0f450add010f2f8e836769a3afc9': docs: gradle version update in plugin file	2015-01-06 02:12:38 +00:00
Joe Fernandez	4dc7c15860	am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs ... * commit '3dcc12892fba022f8c45e9575b23f20bbe55f6b4': docs: gradle wrapper security note	2015-01-06 02:12:32 +00:00
Joe Fernandez	24a3ff4770	am 765ae116: am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs ... * commit '765ae116e2ebab02668c9ef5a7ae11f8a4ffa102': docs: project file and toc updates	2015-01-06 02:12:27 +00:00
Joe Fernandez	e7558b44f7	am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs ... * commit '596868b6489e77f9165e0d03a8d451fccd7f3959': docs: studio workflow links	2015-01-06 02:12:21 +00:00
Joe Fernandez	d1489d5db0	am a78664e0: am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs ... * commit 'a78664e03078d7c671077192357c5e25c0556755': docs: studio tips and ticks grammmar typo	2015-01-06 02:12:16 +00:00
Ricardo Cervera	4d4b599d7c	am ac4444a2: am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs ... * commit 'ac4444a26f19bda442da367ba9bda194f09a68c5': docs: Update wearable lists docs	2015-01-06 02:12:12 +00:00
Joe Fernandez	bea6f1e645	am b1062ad6: am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs ... * commit 'b1062ad68efd04cdf236f8fec184e849da7548cf': docs: studio device emulator updates	2015-01-06 02:12:06 +00:00
Sarah Maddox	73c943fc71	am 15e94fdf: am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs ... * commit '15e94fdf343e688113a47342048ebd2baf646338': docs: Updates the request-location-updates lesson in the location APIs training course.	2015-01-06 02:12:01 +00:00
Ricardo Cervera	fd731d4beb	am fcba6472: am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs ... * commit 'fcba64722bb10fae8c17a994d343080aa439fc8c': docs: Adding vector drawables video	2015-01-06 02:11:56 +00:00
Joe Fernandez	5ec2afea01	am f3d9f030: am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs ... * commit 'f3d9f03053390d81e266027c9dcb69b5c3cc3e83': docs: plugin reference update	2015-01-06 02:11:50 +00:00
Andrew Solovay	ff62a5eea7	am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc ... * commit '4c7390d392dfe4a5df626ce28d415e01cab7d132': docs: New "app compatibility with managed profiles" doc	2015-01-06 02:02:02 +00:00
Joe Fernandez	2719533819	am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs ... * commit '546a0e8c695808c987be3fbac1b3e632b6c6aa8d': docs: studio build output dir name update	2015-01-06 02:01:14 +00:00
Joe Fernandez	851931f062	am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs ... * commit '21b92f34525e12ede8f842f6c426d33093df3b24': docs: gradle version update in plugin file	2015-01-06 02:01:09 +00:00
Joe Fernandez	3dcc12892f	am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs ... * commit '447ea5097ba99ca25ddd613e72e10b57f3405291': docs: gradle wrapper security note	2015-01-06 02:01:05 +00:00
Joe Fernandez	765ae116e2	am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs ... * commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2': docs: project file and toc updates	2015-01-06 02:01:01 +00:00
Joe Fernandez	596868b648	am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs ... * commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e': docs: studio workflow links	2015-01-06 02:00:57 +00:00
Joe Fernandez	a78664e030	am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs ... * commit '411c779bb746d81278b7646ffd96fa6e4f8336b9': docs: studio tips and ticks grammmar typo	2015-01-06 02:00:53 +00:00
Ricardo Cervera	ac4444a26f	am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs ... * commit 'c5fae9593553a89db2ad49306b46b8f9a3631489': docs: Update wearable lists docs	2015-01-06 02:00:48 +00:00
Joe Fernandez	b1062ad68e	am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs ... * commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060': docs: studio device emulator updates	2015-01-06 02:00:42 +00:00
Sarah Maddox	15e94fdf34	am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs ... * commit '4811f9b84766adc17efb730160e15785d74875a3': docs: Updates the request-location-updates lesson in the location APIs training course.	2015-01-06 02:00:32 +00:00
Ricardo Cervera	fcba64722b	am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs ... * commit '9719336b3a9a059c31200137a93f74445d3c7185': docs: Adding vector drawables video	2015-01-06 02:00:24 +00:00
Joe Fernandez	f3d9f03053	am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs ... * commit 'adaef486464af836cd3408657634c972419e4c80': docs: plugin reference update	2015-01-06 02:00:14 +00:00
Scott Rowe	7515d188dd	docs: Checklist for TV Apps ... Change-Id: I93b57161b3e519164dab551068411f686d772596	2015-01-05 17:50:59 -08:00
Christopher Tate	603ad6f7d0	Remove the "backup_data_changed" event log ... Nowadays it's just spammy and uninformative, so away it goes. Bug 18833115 Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e	2015-01-05 17:07:57 -08:00
Alan Viverette	107a4719d5	am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev ... automerge: 1c38711 * commit '1c38711bb45ea074b6456258079b18ba5c834ca6': Scroll handle was half as opaque as it was supposed to be	2015-01-06 01:02:55 +00:00
Alan Viverette	1c38711bb4	am a5478449: am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev ... * commit 'a5478449679366fa48b27ff722160477aeca6dc0': Scroll handle was half as opaque as it was supposed to be	2015-01-06 01:00:40 +00:00
Alan Viverette	a547844967	am ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev ... * commit 'ccfd34f6b59cfd79746bb1698abafc458a83d6cb': Scroll handle was half as opaque as it was supposed to be	2015-01-06 00:54:54 +00:00
Shishir Agrawal	8ddd54fb38	am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev ... * commit '08fb858f82c29467ba6e4bf1f54c56a4791b625d': Data quick settings - Usage shown should take into account merged IDs.	2015-01-06 00:54:34 +00:00
Chris Craik	b15f21effb	Merge "Add overrides and switch to nullptr keyword for all files"	2015-01-06 00:50:53 +00:00
Chris Craik	d41c4d8c73	Add overrides and switch to nullptr keyword for all files ... Adds remaining missing overrides and nullptr usages, missed due to an extreme failure in tool usage. Change-Id: I56abd72975a3999ad13330003c348db40f59aebf	2015-01-05 16:49:13 -08:00
Alan Viverette	ccfd34f6b5	Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev	2015-01-06 00:49:09 +00:00
Shishir Agrawal	08fb858f82	am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev ... * commit '918866778f232ce07b1c2c2d6ea43bf5f0ce827f': Data quick settings - Usage shown should take into account merged IDs.	2015-01-06 00:48:11 +00:00
Shishir Agrawal	918866778f	am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev ... * commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda': Data quick settings - Usage shown should take into account merged IDs.	2015-01-06 00:43:09 +00:00
Shishir Agrawal	8955c54e0e	Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev	2015-01-06 00:37:07 +00:00
Sungsoo Lim	578efef682	am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev ... automerge: c7ad8a6 -s ours * commit 'c7ad8a61b8996d8e15adfca6dad7cf00a3d70a4a': DO NOT MERGE Fix typo	2015-01-06 00:26:32 +00:00
Sungsoo Lim	c7ad8a61b8	am 31d73dce: am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev ... * commit '31d73dce255db34e68ee77bba8c48541378004dd': DO NOT MERGE Fix typo	2015-01-06 00:24:13 +00:00
Rich Slogar	626128b1db	docs: studio bundle checksum update ... Change-Id: I3307009db1be1c4d6f01d158d577a6c373b316bf	2015-01-05 16:23:55 -08:00
Sungsoo Lim	31d73dce25	am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev ... * commit '2bdf89b167d709e170150e5ae5bf888e6535c1fd': DO NOT MERGE Fix typo	2015-01-06 00:18:35 +00:00
Sungsoo Lim	2bdf89b167	Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev	2015-01-06 00:13:14 +00:00
Alan Viverette	c01678ea2d	Scroll handle was half as opaque as it was supposed to be ... BUG: 18903443 Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a	2015-01-05 16:06:26 -08:00
Dianne Hackborn	c478cf5185	Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit ... No longer modify the base constants when computing oom adj values. Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911	2015-01-05 16:05:05 -08:00