ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
42,522 Commits 2 Branches 0 Tags 54 MiB
9b41f16a1f
Commit Graph

42522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
6cc3338849 Merge "Clear reply before writing exception." 2011-12-15 11:51:32 -08:00
Scott Main
6a680a6e05 am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '7e065061bb47fe88421a6edf62c846144e30fcd8':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:13:31 -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
Glenn Kasten
b2362bffc3 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Scott Main
97a68be944 am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'fbc17eccea267c7cee344ac7e7898709f86b37df':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:45:50 -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
Martijn Coenen
565c6f81bf Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Scott Main
5528393b1f am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:17:15 -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
Victoria Lease
0cd5568135 Merge "URL-decode tel: URIs." 2011-12-15 09:59:42 -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
Romain Guy
b42ea1b237 Merge "Generate even fewer GL commands" 2011-12-14 19:25:20 -08:00
Dianne Hackborn
66dd83541e am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.
 2011-12-14 18:21:29 -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
Glenn Kasten
f56285b201 Merge "Fix indentation and whitespace" 2011-12-14 17:35:36 -08:00
Glenn Kasten
2bbff8174b Merge "Improve AudioFlinger error logging" 2011-12-14 17:35:24 -08:00
Glenn Kasten
6e69a6716c Merge "AudioMixer uninitialized simple fields" 2011-12-14 17:35:14 -08:00
Dirk Dougherty
70a69ab68a am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '41d90f39a5c40e3036e15efef5b07789296c8bb9':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:24:46 -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
Glenn Kasten
6966a7af87 Merge "Audio C++ comments" 2011-12-14 16:56:31 -08:00
The Android Open Source Project
1f66f9b411 am b14436d0: Reconcile with ics-mr1-release 
* commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033':
  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 16:08:46 -08:00
The Android Open Source Project
12d3448d5e Reconcile with ics-mr1-release 
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
 2011-12-14 16:05:32 -08:00
Glenn Kasten
f4b0a367ab Merge "Remove unnecessary this->" 2011-12-14 15:40:43 -08:00
Glenn Kasten
941d9f01b2 Merge "Use const char correctly in AudioFlinger" 2011-12-14 15:40:35 -08:00
Glenn Kasten
429a2ef9ee Merge "Use units after all times" 2011-12-14 15:40:27 -08:00
Glenn Kasten
a9afba8919 Merge "Fix typo in error message, missing space" 2011-12-14 15:40:18 -08:00
Glenn Kasten
93244b220d Merge "Delete obsolete includes" 2011-12-14 15:40:11 -08:00
Glenn Kasten
113c131004 Merge "Remove redundant clear()" 2011-12-14 15:40:01 -08:00
Glenn Kasten
803557e7a5 Merge "Fix includes" 2011-12-14 15:39:52 -08:00
Jaikumar Ganesh
46612bb550 Merge "Change the fd to be blocking for health profile." 2011-12-14 15:25:25 -08:00
Glenn Kasten
23065910e6 Merge "AudioTrack::setVolume check range" 2011-12-14 15:05:56 -08:00
Scott Main
d14711ff3b am 5ebf8fbb: am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit '5ebf8fbb1e925d411d928757712c41a7cafe8231':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 15:00:59 -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
adb3abb1e7 am d8dec142: am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit 'd8dec14201250055fe9bcccead361168c839d9f9':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:57:50 -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
aea7c25ec2 am fd24af66: am 691fea72: am 70645e36: Docs: Add class for Sharing Content 
* commit 'fd24af6620ee346bfbbc29a62290f67141a79245':
  Docs: Add class for Sharing Content
 2011-12-14 14:45:46 -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
Brian Colonna
c2bcf36d0d Merge "Added Face Unlock to tablet lockscreen layouts" 2011-12-14 14:14:24 -08:00
James Dong
39fc0a0805 am 3f6a7d1e: 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 '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
  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:53:31 -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