Mathias Agopian
2342fbdccb
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
521b8d5c71
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
a950aa8418
Merge "Make sure to use filtering while in fixed-size mode" into kraken
2010-05-26 22:11:03 -07:00
Mathias Agopian
9237703335
Make sure to use filtering while in fixed-size mode
2010-05-26 22:10:04 -07:00
Irfan Sheriff
2d8b3e94cf
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
35ba2de255
am 2ed40379: am 8316e875: am b3f3caef: Merge "Fix null pointer exception" into froyo
2010-05-26 21:39:39 -07:00
Mathias Agopian
801f90bd80
am 2a0f01ea: am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:38:42 -07:00
Irfan Sheriff
2ed4037901
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
2a0f01ea07
am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:36:47 -07:00
Mathias Agopian
7ca7eedbae
Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
2010-05-26 21:34:52 -07:00
Irfan Sheriff
8316e875ba
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
Irfan Sheriff
b3f3caef38
Merge "Fix null pointer exception" into froyo
2010-05-26 21:32:29 -07:00
Mathias Agopian
663baddda9
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
2010-05-26 21:31:09 -07:00
Dirk Dougherty
463838d804
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
6b9b5e12a6
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
81662bc76a
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
f69fd4dd48
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
4273ce19bf
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
2010-05-26 18:31:38 -07:00
Dirk Dougherty
0f3abfb5c0
Doc change: Suggest min keysize of 2048 for keys.
...
Change-Id: I6dcfe9aa12338e4ad71db2e6812ce387a75c09f0
2010-05-26 17:34:09 -07:00
Irfan Sheriff
7baec0fe4e
Fix null pointer exception
...
Bug: 2718857
Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
2010-05-26 17:16:47 -07:00
James Dong
efb6b574de
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
9407fb8062
am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:02:45 -07:00
James Dong
1090a29d4e
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
2010-05-26 17:01:16 -07:00
Dirk Dougherty
4a4b33fbe1
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
d459439fcb
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
James Dong
aed15e7856
Avoid repeatedly allocating and freeing memory in CameraSource
...
Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
2010-05-26 16:54:18 -07:00
Dirk Dougherty
b8ab347b30
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
81800015af
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
fa499e4620
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
2010-05-26 16:49:46 -07:00
Dirk Dougherty
75102d04bd
Doc change: fix adt download page, misc doc fixes.
...
Change-Id: Ifa04ea6f31cf0677bf95263188a137fd8dd721eb
2010-05-26 16:37:48 -07:00
Jim Miller
dc0f4f059c
Merge "Fix 2584857: Reset grabbed state when SlidingTab visibility changes"
2010-05-26 13:22:26 -07:00
Andreas Huber
c6b9311afa
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
1c12511fda
am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
2010-05-26 13:12:30 -07:00
Andreas Huber
a08d85237a
Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
2010-05-26 13:10:47 -07:00
Irfan Sheriff
41f614d611
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
8995192794
am 38417782: am c8390047: am 9ecca85f: Merge "Fix escaping of characters" into froyo
2010-05-26 13:07:38 -07:00
Irfan Sheriff
3841778298
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
c8390047bd
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
9ecca85f06
Merge "Fix escaping of characters" into froyo
2010-05-26 13:02:06 -07:00
Andreas Huber
eae953bfd4
Convert a number of assertions into runtime errors (OggExtractor)
...
Change-Id: I8fcaec927d7b72e9d61cb7283e54523711980268
2010-05-26 12:59:06 -07:00
Andreas Huber
7760ef5a30
am e08d5ccf: am a581a776: Merge "Squashed commit of the following:" into kraken
2010-05-26 11:43:13 -07:00
Eric Laurent
84440ee9aa
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
b3ece2d595
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
cbc8270c7e
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
5ee2a771b5
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
585d6e11af
Merge "resolved conflicts for merge of 3cd6a3e3 to master"
2010-05-26 11:40:53 -07:00
Dmitry Shmidt
3cc02cbf90
Merge "bugreport: wifi: Add list of networks"
2010-05-26 11:32:57 -07:00
Andreas Huber
e08d5ccfa0
am a581a776: Merge "Squashed commit of the following:" into kraken
2010-05-26 11:22:49 -07:00
Andreas Huber
a581a77640
Merge "Squashed commit of the following:" into kraken
2010-05-26 11:21:06 -07:00
Dmitry Shmidt
631e0f163a
bugreport: wifi: Add list of networks
...
Change-Id: I0271bf1f2cac874c1801658a81a3dcf7533da781
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com >
2010-05-26 10:57:11 -07:00
