ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,638 Commits 2 Branches 0 Tags 54 MiB
5ea13b0ac8
Commit Graph

16638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
4d912627a6 am b8ab347b: am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 2010-05-26 16:54:46 -07:00
Dirk Dougherty
414a687dfa am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 
Merge commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b' into kraken

* commit '81800015afe3ee397bc6b07e37fd6dc57e3a3b9b':
  Doc change: fix adt download page, misc doc fixes.
 2010-05-26 16:53:04 -07:00
Dirk Dougherty
e69271769a am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo 
Merge commit 'fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp

* commit 'fa499e46203dba2db2bb40f71e5af1650315c67c':
  Doc change: fix adt download page, misc doc fixes.
 2010-05-26 16:51:12 -07:00
Dirk Dougherty
60f35bb2fe Merge "Doc change: fix adt download page, misc doc fixes." into froyo 2010-05-26 16:49:46 -07:00
Jim Miller
e37897c15c Merge "Fix 2584857: Reset grabbed state when SlidingTab visibility changes" 2010-05-26 13:22:26 -07:00
Andreas Huber
a2c0cf5e3a am 1c12511f: am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken 2010-05-26 13:13:52 -07:00
Andreas Huber
c96c34f43f am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken 2010-05-26 13:12:30 -07:00
Andreas Huber
3c0ade2393 Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken 2010-05-26 13:10:47 -07:00
Irfan Sheriff
0589b35cf6 am 89951927: am 38417782: am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo 2010-05-26 13:08:58 -07:00
Irfan Sheriff
763a071f09 am 38417782: am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo 2010-05-26 13:07:38 -07:00
Irfan Sheriff
07e4687407 am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo 
Merge commit 'c8390047bd2344032aca915816a8b91590835105' into kraken

* commit 'c8390047bd2344032aca915816a8b91590835105':
  Fix escaping of characters
 2010-05-26 13:05:53 -07:00
Irfan Sheriff
df360ef5dd am 9ecca85f: Merge "Fix escaping of characters" into froyo 
Merge commit '9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp

* commit '9ecca85f0613032590c6840cae48b54f3d626181':
  Fix escaping of characters
 2010-05-26 13:04:11 -07:00
Irfan Sheriff
d50f8399fa Merge "Fix escaping of characters" into froyo 2010-05-26 13:02:06 -07:00
Andreas Huber
7a83fcbac8 am e08d5ccf: am a581a776: Merge "Squashed commit of the following:" into kraken 2010-05-26 11:43:13 -07:00
Eric Laurent
1b3e6e881f am 83904eb5: am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-26 11:43:00 -07:00
Mathias Agopian
5a733d4455 am eaac2761: am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-26 11:42:51 -07:00
Yu Shan Emily Lau
ee9c93664a am 393f5698: am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-26 11:42:39 -07:00
Jim Miller
468d83ab7a am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-26 11:42:33 -07:00
Robert Greenwalt
9be97a799f Merge "resolved conflicts for merge of 3cd6a3e3 to master" 2010-05-26 11:40:53 -07:00
Dmitry Shmidt
79171a05f0 Merge "bugreport: wifi: Add list of networks" 2010-05-26 11:32:57 -07:00
Andreas Huber
9d07793e7e am a581a776: Merge "Squashed commit of the following:" into kraken 2010-05-26 11:22:49 -07:00
Andreas Huber
caf11a838d Merge "Squashed commit of the following:" into kraken 2010-05-26 11:21:06 -07:00
Robert Greenwalt
ff85651004 resolved conflicts for merge of 3cd6a3e3 to master 
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
 2010-05-26 10:37:48 -07:00
Vasu Nori
6688660fe0 Merge "when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it" 2010-05-26 10:27:40 -07:00
Kristian Monsen
232403baf2 Merge "Display index and count when running layout tests" 2010-05-26 03:05:08 -07:00
Eric Laurent
fab6b48ed1 am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:49:53 -07:00
Eric Laurent
4c2329c9a1 Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:48:30 -07:00
Mathias Agopian
5a93f3ffba am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:57:08 -07:00
Mathias Agopian
18d92c9c70 Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:56:07 -07:00
Mathias Agopian
631f358d34 fix [2712278] The preview buffer left some black borders in left and bottom edges 
we were incorrectly flagging push_buffer surfaces as invalid

Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
 2010-05-25 17:51:34 -07:00
Yu Shan Emily Lau
0f9929da64 am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:46:46 -07:00
Yu Shan Emily Lau
b9949d299f am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:44:46 -07:00
Yu Shan Emily Lau
605cb756f8 am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
d5fa4a9f4f Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:40:51 -07:00
Jim Miller
75119dd23f am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:14:50 -07:00
Jim Miller
6bd416f0bf Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Robert Greenwalt
e57c323f7e am ac53a8a1: am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 2010-05-25 16:17:23 -07:00
Robert Greenwalt
50d4522e4a am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:15:37 -07:00
Robert Greenwalt
1a5fe61ee1 am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:13:22 -07:00
Daisuke Miyakawa
a85dc38b8e Merge "Add KDDI/Softbank to available Shift_Jis mapping." 2010-05-25 15:22:35 -07:00
Andreas Huber
b0c7f6cb4e am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:20:46 -07:00
Andreas Huber
bc1accfc1a am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:19:13 -07:00
Andreas Huber
60eef82e4d Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:16:23 -07:00
Eric Laurent
9a90b98f7a am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:46:12 -07:00
Eric Laurent
18f0405e75 am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:44:08 -07:00
Eric Laurent
dee5c2a3dc Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:42:53 -07:00
Marco Nelissen
56bfd09900 Merge "Allow root to set the mount state as well, so that the simulator can use the fake sd card." 2010-05-25 12:04:03 -07:00
Andreas Huber
9df565617c am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:35:18 -07:00
Andreas Huber
ded634d7a2 am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:33:39 -07:00
Wink Saville
54ff7c5c8d Merge "Add needsOtaServiceProvisioning to Phone." 2010-05-25 11:20:30 -07:00