Scott Main
63752fc830
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
75e12152fd
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
9827c71df4
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
e872d9213f
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
275749e796
am abfcbd16: docs: typo in training orientation
...
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
docs: typo in training orientation
2011-12-15 19:47:47 -08:00
Roman Nurik
fa90d7d9f2
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
Roman Nurik
21c8f7b615
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
4c63a75d56
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
5e2c246218
Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
2011-12-15 19:23:26 -08:00
Roman Nurik
d2db6cf3a0
Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
2011-12-15 19:23:00 -08:00
Scott Main
e81ece3465
am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
...
* commit 'aeb06e34085703fe9699cdc3454558d69092bd7c':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:41:58 -08:00
Scott Main
c016595b2a
am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update title names for many lessons
...
* commit '5f0df1b8db25859a1e99425cfd87562ef71e6478':
docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:39:43 -08:00
Scott Main
0bee144610
am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
...
* commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e':
Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:39:35 -08:00
Scott Main
ef007ca60f
am 580f0146: docs: add camera and design, remove users update title names for many lessons
...
* commit '580f0146535e7daed83aef721f505270f7b040e1':
docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:37:36 -08:00
Scott Main
bf60c4d34b
Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
2011-12-15 17:36:58 -08:00
Sparky Rhode
cad9f4d877
am ea627994: am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
...
* commit 'ea627994c3940711c27e27a6d5d98bb135944710':
Remove references to sample application
2011-12-15 17:25:28 -08:00
Sparky Rhode
c5d14267a3
am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
...
* commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
Remove references to sample application
2011-12-15 17:23:11 -08:00
Sparky Rhode
7f3aac506a
Merge "Remove references to sample application" into ics-mr0
2011-12-15 17:21:51 -08:00
Roman Nurik
8b589d0200
am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
...
* commit 'eb623347f9a0c46e6ccf5791c03f99d37a0b65f8':
Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:50:23 -08:00
Roman Nurik
a8c593f17d
am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
...
* commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:48:25 -08:00
Roman Nurik
189d5afa91
Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
2011-12-15 16:45:55 -08:00
Scott Main
425b7f0678
am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
...
* commit '6aee4582feae70254094e343412114c0b0abaf2d':
docs: Add training homepage, side nav, and title changes
2011-12-15 16:31:54 -08:00
Scott Main
c9a175a70f
am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
...
* commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0':
docs: Add training homepage, side nav, and title changes
2011-12-15 16:29:42 -08:00
Scott Main
431002d2f7
Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
2011-12-15 16:28:19 -08:00
Scott Main
c8ea2d52f7
am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class
...
* commit 'fc6ac0f28f9f7d06963fb330b218376099a91596':
docs: Android University - Camera class
2011-12-15 16:12:23 -08:00
Scott Main
c55dd46c91
am 564e8aa4: docs: Android University - Camera class
...
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
docs: Android University - Camera class
2011-12-15 16:10:10 -08:00
Scott Main
35ad6be535
am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
...
* commit '19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
2011-12-15 15:58:33 -08:00
Scott Main
a5261478a0
am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
...
* commit 'd25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
2011-12-15 15:55:31 -08:00
Scott Main
8cb9834eed
am 43834487: docs: remove some "new" tags from side navs
...
* commit '43834487a183b69783b0de270f9b761f3afffdc1':
docs: remove some "new" tags from side navs
2011-12-15 13:14:41 -08:00
Scott Main
b85127ab00
am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
...
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
Android U Class: Monetization / Ads without Compromising User Experience
2011-12-15 11:11:39 -08:00
Scott Main
a44a3f8b82
am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
...
* commit '3d672e1e789e171e913605945efe95a477ab0505':
Android U Class: Monetization / Ads without Compromising User Experience
2011-12-15 11:08:51 -08:00
Scott Main
553d695294
am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
...
* commit 'cf927f229f55849caf3461621023b5bd61908334':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
2011-12-15 10:43:46 -08:00
Scott Main
15cd12dcec
am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
...
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
2011-12-15 10:41:18 -08:00
Scott Main
a222ebf4fa
am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users.
...
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
Docs: Training class on Identifying and Authenticating Users.
2011-12-15 10:15:21 -08:00
Scott Main
bff64425b6
am f9cca66e: Docs: Training class on Identifying and Authenticating Users.
...
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
Docs: Training class on Identifying and Authenticating Users.
2011-12-15 10:13:07 -08:00
Dianne Hackborn
576b5a6470
am 399f1df3: Merge "Fix some java docs." into ics-mr1
...
* commit '399f1df38594ea8bc927ad23bfbde996a9dc161d':
Fix some java docs.
2011-12-14 18:19:42 -08:00
Dianne Hackborn
595c99dff2
Merge "Fix some java docs." into ics-mr1
2011-12-14 18:18:29 -08:00
Dirk Dougherty
560799e8ca
am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
...
* commit '26bd66df4fc8caa7885fe3a4e78e379389a24a94':
Doc change: add MR1 API summary and updated highlights.
2011-12-14 17:22:59 -08:00
Dirk Dougherty
cb153108db
Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
2011-12-14 17:21:13 -08:00
The Android Open Source Project
12d3448d5e
Reconcile with ics-mr1-release
...
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
2011-12-14 16:05:32 -08:00
Scott Main
e25359b5bb
am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
...
* commit 'd1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 14:58:02 -08:00
Scott Main
b369f632a6
am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
...
* commit 'b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
doc change: Android U lessons for audio and battery
2011-12-14 14:56:02 -08:00
Scott Main
bff0727132
am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
...
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 14:55:44 -08:00
Scott Main
237818dc58
am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
...
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
doc change: Android U lessons for audio and battery
2011-12-14 14:53:40 -08:00
Scott Main
86899230f7
Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
2011-12-14 14:53:04 -08:00
Scott Main
e74d5a1abc
Merge "doc change: Android U lessons for audio and battery" into ics-mr0
2011-12-14 14:51:30 -08:00
Scott Main
89d8bf771d
am 691fea72: am 70645e36: Docs: Add class for Sharing Content
...
* commit '691fea726dbefe2a7142b403bfc47f5c9029f61a':
Docs: Add class for Sharing Content
2011-12-14 14:42:57 -08:00
Scott Main
932651387c
am 70645e36: Docs: Add class for Sharing Content
...
* commit '70645e363e8601550468b726251f4f52f383b9fc':
Docs: Add class for Sharing Content
2011-12-14 14:40:19 -08:00
James Dong
e6f21efc7b
am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
...
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
2011-12-14 13:50:08 -08:00
The Android Open Source Project
0ab2a4bebe
Reconcile with ics-mr1-release
...
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
2011-12-13 19:10:19 -08:00