64811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fred Chung	14633f1b1e	am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. ... * commit '48e0617b9e7d06da803c572d6584d68898733d37': Fixed Android U Enterprise lesson pre-requisites and a minor typo.	2011-12-15 22:33:31 -08:00
Fred Chung	48e0617b9e	Fixed Android U Enterprise lesson pre-requisites and a minor typo. ... Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02	2011-12-15 22:25:19 -08:00
Scott Main	e3bfb3a0cc	am 734a9954: am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 ... * commit '734a9954eca793d480e05fd012f82111ed54d2f1': docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6	2011-12-15 22:18:51 -08:00
Scott Main	734a9954ec	am ed8851a6: am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 ... * commit 'ed8851a6f2e4d9477aaa20c333d7220901d8faeb': docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6	2011-12-15 22:17:15 -08:00
Scott Main	ed8851a6f2	am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 ... * commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26': docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6	2011-12-15 22:14:48 -08:00
Scott Main	00338dc07b	am 6475bd21: am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment ... * commit '6475bd21122b26fd3dfeeca9be8c973d5b928910': docs: update homepage for 4.0.3 announcment	2011-12-15 22:13:32 -08:00
Scott Main	8e980c1e4e	Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1	2011-12-15 22:12:53 -08:00
Scott Main	6475bd2112	am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment ... * commit '4faca92faa13bcf5d6c2e76b226466066e5562a2': docs: update homepage for 4.0.3 announcment	2011-12-15 22:12:08 -08:00
Scott Main	4faca92faa	am 36c67785: docs: update homepage for 4.0.3 announcment ... * commit '36c677855c0a54ede9e92aa856cb2250960e922e': docs: update homepage for 4.0.3 announcment	2011-12-15 22:09:46 -08:00
Scott Main	36c677855c	docs: update homepage for 4.0.3 announcment ... Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0	2011-12-15 22:04:46 -08:00
Jamie Gennis	94180377e7	SurfaceMediaSource: use the HW_TEXTURE usage bit ... This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179	2011-12-15 20:52:26 -08:00
The Android Automerger	ce2ac73d1d	merge in ics-mr1-release history after reset to ics-mr1	2011-12-15 20:50:02 -08:00
Scott Main	25514ce3ab	am b2f1cda7: am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) ... * commit 'b2f1cda755c26951b175ca069e156b512d66b42a': docs: fix encoding issue or whatever with docs (not showing titles)	2011-12-15 20:26:58 -08:00
Scott Main	b2f1cda755	am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) ... * commit 'b193d24145d84a1748cfdcffae56ebfe549ef940': docs: fix encoding issue or whatever with docs (not showing titles)	2011-12-15 20:24:47 -08:00
Scott Main	b193d24145	am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) ... * commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5': docs: fix encoding issue or whatever with docs (not showing titles)	2011-12-15 20:22:39 -08:00
Scott Main	4cb7d09535	am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) ... * commit '98af5edc70b0b418366f5197b9aeef30f135d40e': docs: fix encoding issue or whatever with docs (not showing titles)	2011-12-15 20:19:55 -08:00
Jamie Gennis	3e0f448fbe	SurfaceMediaSource: use the HW_TEXTURE usage bit ... This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179	2011-12-15 20:18:19 -08:00
Scott Main	98af5edc70	docs: fix encoding issue or whatever with docs (not showing titles) ... Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b	2011-12-15 20:13:20 -08:00
Scott Main	2302ce32be	am 680ccb51: am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 ... * commit '680ccb511b9375caac12bd3e292acb96af286aeb': docs: add remembering users class to nav	2011-12-15 20:03:38 -08:00
Scott Main	680ccb511b	am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 ... * commit '34e46115a5cee1b0e186b450ef2598df999c5cbe': docs: add remembering users class to nav	2011-12-15 20:01:28 -08:00
Scott Main	3f775a0ed8	am 2538d4a5: am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 ... * commit '2538d4a55c1bce3302774191eb8986bbdf3dc543': Doc merge from master:Training class on Identifying and Authenticating Users.	2011-12-15 19:59:29 -08:00
Scott Main	34e46115a5	am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 ... * commit '8f266b9e348ba69d953568624b8d0e2cea07f99d': docs: add remembering users class to nav	2011-12-15 19:59:25 -08:00
Scott Main	2538d4a55c	am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 ... * commit '98e4adf942fe3ade14225875fdb018efe941e99f': Doc merge from master:Training class on Identifying and Authenticating Users.	2011-12-15 19:57:21 -08:00
Scott Main	8f266b9e34	am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 ... * commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54': docs: add remembering users class to nav	2011-12-15 19:56:47 -08:00
Scott Main	d9bc2d21c5	Merge "docs: add remembering users class to nav" into ics-mr0	2011-12-15 19:55:25 -08:00
Scott Main	98e4adf942	am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 ... * commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed': Doc merge from master:Training class on Identifying and Authenticating Users.	2011-12-15 19:55:00 -08:00
Scott Main	3102371917	am d44f07e9: am ec09b269: am ce5643c7: am abfcbd16: docs: typo in training orientation ... * commit 'd44f07e968a3323562646d6b07cfc7208a1cb78d': docs: typo in training orientation	2011-12-15 19:54:10 -08:00
Scott Main	26e461b34f	am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 ... * commit '5dac1976198e5fa553749cd145c7484f3ff45c6b': Doc merge from master:Training class on Identifying and Authenticating Users.	2011-12-15 19:52:50 -08:00
Scott Main	2956f2fd2c	docs: add remembering users class to nav ... Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8	2011-12-15 19:52:33 -08:00
Scott Main	d44f07e968	am ec09b269: am ce5643c7: am abfcbd16: docs: typo in training orientation ... * commit 'ec09b2691ef24e25d28d9946c722d154b6067224': docs: typo in training orientation	2011-12-15 19:52:14 -08:00
Scott Main	5dac197619	Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0	2011-12-15 19:51:48 -08:00
Scott Main	ec09b2691e	am ce5643c7: am abfcbd16: docs: typo in training orientation ... * commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316': docs: typo in training orientation	2011-12-15 19:49:50 -08:00
Scott Main	ce5643c7c4	am abfcbd16: docs: typo in training orientation ... * commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1': docs: typo in training orientation	2011-12-15 19:47:47 -08:00
Dirk Dougherty	3b33cdcbf8	Doc merge from master:Training class on Identifying and Authenticating Users. ... Conflicts: docs/html/training/id-auth/authenticate.jd docs/html/training/id-auth/custom_auth.jd docs/html/training/id-auth/identify.jd docs/html/training/id-auth/index.jd Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69	2011-12-15 19:45:27 -08:00
Scott Main	abfcbd162f	docs: typo in training orientation ... Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c	2011-12-15 19:33:04 -08:00
Roman Nurik	455179e354	am 75064f5d: am 0bc0e5e3: am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 ... * commit '75064f5d1205a7e408a3907409942dd1dafcfcc6': docs: Minor bugfix to Android U navigation design class	2011-12-15 19:31:35 -08:00
Dave Burke	762389c2fe	am 2b6449bb: am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 ... * commit '2b6449bbbce5808685c48d9b878008487b045956': SurfaceMediaSource: use the HW_TEXTURE usage bit	2011-12-15 19:29:31 -08:00
Roman Nurik	75064f5d12	am 0bc0e5e3: am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 ... * commit '0bc0e5e35ae0939f85da5b79df69a6b6040bf496': docs: Minor bugfix to Android U navigation design class	2011-12-15 19:29:27 -08:00
Roman Nurik	0bc0e5e35a	am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 ... * commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e': docs: Minor bugfix to Android U navigation design class	2011-12-15 19:27:25 -08:00
Dave Burke	2b6449bbbc	am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 ... * commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1': SurfaceMediaSource: use the HW_TEXTURE usage bit	2011-12-15 19:27:17 -08:00
Roman Nurik	1584a816ed	am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 ... * commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05': docs: Minor bugfix to Android U navigation design class	2011-12-15 19:25:25 -08:00
Dave Burke	0cc1e42d74	am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 ... * commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f': SurfaceMediaSource: use the HW_TEXTURE usage bit	2011-12-15 19:25:07 -08:00
Dave Burke	ac279de9d9	Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1	2011-12-15 19:23:26 -08:00
Roman Nurik	408f94b147	Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0	2011-12-15 19:23:00 -08:00
Roman Nurik	265644e22a	docs: Minor bugfix to Android U navigation design class ... Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f	2011-12-15 19:20:02 -08:00
Jeff Sharkey	1f3446b226	am d6451e02: Merge "Move NMS observers to RemoteCallbackList." ... * commit 'd6451e02ad2da274c64b973561bbece6a86631ef': Move NMS observers to RemoteCallbackList.	2011-12-15 18:41:51 -08:00
Jeff Sharkey	d6451e02ad	Merge "Move NMS observers to RemoteCallbackList."	2011-12-15 18:40:21 -08:00
Jamie Gennis	09fc76664a	SurfaceMediaSource: use the HW_TEXTURE usage bit ... This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179	2011-12-15 18:36:08 -08:00
Dianne Hackborn	bfd89b35ba	Don't forget to close files. ... Change-Id: Ibfe465e1d7a947bbe40da17e8e8a2713856f95b5	2011-12-15 18:22:54 -08:00
Scott Main	469d1f1447	am a9099eeb: am 6bbd38e9: am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 ... * commit 'a9099eeb241c8785b777ad9ce3548ec026e8b073': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.	2011-12-15 17:46:45 -08:00