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

41517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
6d0a1275e1 merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:14:25 -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
Dirk Dougherty
09998b1bf1 am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 
* commit '2e335cb02891d3653b938340a11698844e2c3d6d':
  Doc change: API diff report for 15.
 2011-12-13 18:35:10 -08:00
Dirk Dougherty
b2177213f0 Merge "Doc change: API diff report for 15." into ics-mr1 2011-12-13 18:33:04 -08:00
The Android Automerger
cbe3d5bc7e merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:03:26 -08:00
Dianne Hackborn
990f3c5fe9 am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
  Fix issue #5756204: Crespo IME briefly appears shortened when...
 2011-12-13 15:41:54 -08:00
Dianne Hackborn
1b90c5bd0d Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 2011-12-13 15:40:18 -08:00
Gilles Debunne
aed8f093a0 am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
  Do not spell check the foreground ExtractEditText.
 2011-12-13 15:38:43 -08:00
Gilles Debunne
8d0b3f3474 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 2011-12-13 15:36:48 -08:00
Dianne Hackborn
8ec06aaf4a am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
  Fix issue #5755172: Soft menu key disappears when menu is open
 2011-12-13 13:42:07 -08:00
Gilles Debunne
75ce7098b3 am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1 
* commit '67d54ac017494229eed27a184159461d63201a9f':
  NPE in GMail / TextLine
 2011-12-13 13:40:00 -08:00
Dianne Hackborn
f3600e569a Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 2011-12-13 13:38:56 -08:00
Gilles Debunne
366d1432ed Merge "NPE in GMail / TextLine" into ics-mr1 2011-12-13 13:37:29 -08:00
Scott Main
d0f5b5ba80 am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:13:15 -08:00
Scott Main
95c8297d4f am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:13:07 -08:00
Scott Main
db20a9b152 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
 2011-12-13 13:10:45 -08:00
Scott Main
568bf65826 am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 13:10:42 -08:00
Scott Main
f07b37cde6 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Andreas Huber
a0c39d8bef am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 
* commit '3ab630084071eb5dc7f92b4a8a617f8cef10c514':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
 2011-12-13 12:01:46 -08:00
Andreas Huber
3ef0a52028 Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 2011-12-13 11:59:50 -08:00
The Android Open Source Project
fca20c9b5d Reconcile with ics-mr1-release 
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
 2011-12-13 05:11:43 -08:00
The Android Automerger
0998dbaa26 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Jeff Sharkey
149427a372 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
 2011-12-12 20:21:34 -08:00
Jeff Sharkey
b4d1ec8d9d Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Mike Cleron
24643b6a70 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 18:17:46 -08:00
Mike Cleron
ee5de0ffff Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Dianne Hackborn
76cc3dfcff am 359bb3b4: Final API 15. 
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
 2011-12-12 17:04:04 -08:00
Dianne Hackborn
38478c79f5 am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 16:12:40 -08:00