Mathias Agopian
a051357406
Merge "clean-up dead-code" into kraken
2010-05-26 22:20:39 -07:00
Mathias Agopian
dc7a80f07a
clean-up dead-code
2010-05-26 22:19:19 -07:00
Mathias Agopian
adb1550d38
am 521b8d5c: am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:14:43 -07:00
Mathias Agopian
30643d5fbb
am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:12:55 -07:00
Mathias Agopian
eaa60d313a
Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:11:03 -07:00
Mathias Agopian
a7f669256f
Make sure to use filtering while in fixed-size mode
2010-05-26 22:10:04 -07:00
Irfan Sheriff
200f895557
am 35ba2de2: am 2ed40379: am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
2010-05-26 21:41:29 -07:00
Irfan Sheriff
8c13514b44
am 2ed40379: am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
2010-05-26 21:39:39 -07:00
Mathias Agopian
4f20157df2
am 2a0f01ea: am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:38:42 -07:00
Irfan Sheriff
5260f23bf1
am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit '8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken
* commit '8316e875baee53b661d5af8fa843d97e51acbcf6':
Fix null pointer exception
2010-05-26 21:37:45 -07:00
Mathias Agopian
ce5d8bb772
am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:36:47 -07:00
Irfan Sheriff
4a977bd462
am b3f3caef: Merge "Fix null pointer exception" into froyo
...
Merge commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit 'b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
2010-05-26 21:34:52 -07:00
Mathias Agopian
1afa755ca8
Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:34:52 -07:00
Irfan Sheriff
cde682745c
Merge "Fix null pointer exception" into froyo
2010-05-26 21:32:29 -07:00
Mathias Agopian
38ece279ea
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
2010-05-26 21:31:09 -07:00
Dirk Dougherty
aafc5ff645
am 6b9b5e12: am 81662bc7: am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:38:44 -07:00
Dirk Dougherty
4c19fbe6fc
am 81662bc7: am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:37:11 -07:00
Dirk Dougherty
6d5ae81061
am f69fd4dd: am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297' into kraken
* commit 'f69fd4dd481c10749a8651ab6c9cfda1dea68297':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:35:22 -07:00
Dirk Dougherty
58fccc44cd
am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
...
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
2010-05-26 18:33:05 -07:00
Dirk Dougherty
6667c7976f
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:31:38 -07:00
James Dong
59e651d6ea
am 9407fb80: am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:04:37 -07:00
James Dong
d909ce2b1b
am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:02:45 -07:00
James Dong
dc976c589b
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:01:16 -07:00
Dirk Dougherty
5ba8bb2ba9
am d459439f: am b8ab347b: am 81800015: am fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
2010-05-26 16:56:43 -07:00
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
