ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
41,462 Commits 2 Branches 0 Tags 54 MiB
71eca06117
Commit Graph

41462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
71eca06117 am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1 
* commit '8c65ab81e84f36c311d2ae6831819a5caa404548':
  Updated "Designing for Security" documentation
 2011-12-16 10:58:42 -08:00
Dirk Dougherty
da79d5097d Merge "Updated "Designing for Security" documentation" into ics-mr1 2011-12-16 10:56:29 -08:00
Scott Main
aca302af4c am 611d03e6: docs: typos 
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
  docs: typos
 2011-12-16 10:45:22 -08:00
The Android Open Source Project
7e97651fe3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Dirk Dougherty
480be20aba am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Joe Fernandez
2ee51878fe am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
155e09d518 Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Fred Chung
78bd4d50f0 am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
3aa6cccff1 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
Scott Main
e10fada930 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
7f3a146b9d 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
7d6b89e7e1 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
The Android Automerger
73ce026418 merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
e3f5721dc7 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
c3df4ee009 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
Scott Main
4e7c034df0 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
d8f66098f8 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
b6f7ffd6ad Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
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