Andreas Huber
de904fb82a
am 2130fc82: am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
2010-05-20 11:17:59 -07:00
Andreas Huber
e621a78d35
am c6a16327: am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
2010-05-20 11:16:28 -07:00
Andreas Huber
c31f5af0b9
am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
...
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken
* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:14:37 -07:00
Andreas Huber
22f6934983
am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
...
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp
* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
2010-05-20 11:13:20 -07:00
Andreas Huber
5fed07aa18
Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
2010-05-20 11:11:39 -07:00
Xia Wang
13cecbd225
am 17530508: am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 11:01:54 -07:00
Xia Wang
4961520ea2
am cf7d2d50: am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 11:00:22 -07:00
Xia Wang
d7d571221c
am 3716ea04: am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
...
Merge commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken
* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:58:18 -07:00
Xia Wang
639f95ed10
am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
...
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
2010-05-20 10:56:13 -07:00
Wu-cheng Li
080f268c00
am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:50:23 -07:00
Wu-cheng Li
e2a369a34f
am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:48:26 -07:00
Wu-cheng Li
f001a4ba76
Merge "Fix javadoc of camera focus distances API." into kraken
2010-05-20 01:46:51 -07:00
Dirk Dougherty
3abba995a2
am b482577a: am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
2010-05-20 00:21:00 -07:00
Dirk Dougherty
93b01549eb
am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
2010-05-20 00:18:57 -07:00
Dirk Dougherty
2b09d0914c
am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.
...
Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken
* commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
Doc change: Add new tv to carousel.
2010-05-20 00:17:14 -07:00
Dirk Dougherty
1a4edf5b0d
am dc737ca9: Doc change: Add new tv to carousel.
...
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
2010-05-20 00:15:41 -07:00
Scott Main
9c81655f23
am 5619e3ad: am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
2010-05-19 20:31:03 -07:00
Scott Main
a6da389947
am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
2010-05-19 20:29:31 -07:00
Scott Main
417a858c31
am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
...
Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken
* commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac':
docs: add youtube video to highlights
2010-05-19 20:27:21 -07:00
Scott Main
6beef8e2d8
am 55f383a9: Merge "docs: add youtube video to highlights" into froyo
...
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
2010-05-19 20:25:15 -07:00
Scott Main
98ca2ec913
Merge "docs: add youtube video to highlights" into froyo
2010-05-19 20:24:18 -07:00
Scott Main
586f94bd60
am 67d8dce3: am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
2010-05-19 19:35:12 -07:00
Scott Main
76fd7bde14
am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
2010-05-19 19:33:44 -07:00
Scott Main
4701e1be98
am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
...
Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken
* commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
doc: add developing and testing info to backup guide
2010-05-19 19:32:25 -07:00
Scott Main
540070ae0d
am 80259899: Merge "doc: add developing and testing info to backup guide" into froyo
...
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
2010-05-19 19:30:29 -07:00
Scott Main
ee85a0abcb
Merge "doc: add developing and testing info to backup guide" into froyo
2010-05-19 19:29:19 -07:00
Dirk Dougherty
def76212d4
am f9a1ebe5: am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
2010-05-19 19:03:54 -07:00
Dirk Dougherty
01d5a36bc2
am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
2010-05-19 19:02:13 -07:00
Dirk Dougherty
4caf488b34
am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
...
Merge commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken
* commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07':
Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:59:57 -07:00
Dirk Dougherty
66578db683
am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
...
Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:58:03 -07:00
Jason Sams
92c6be3fd7
Merge "Begin naming cleanup for renderscript runtime. Prefix functions with "rs" or "rsg"."
2010-05-19 18:56:00 -07:00
Scott Main
8964494dd1
am 868dbc89: am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights
2010-05-19 18:12:04 -07:00
Scott Main
1f5ef14f73
am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights
2010-05-19 18:10:22 -07:00
Scott Main
e2c1d42332
am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights
...
Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken
* commit 'fa6ee245c7010101d87194b00f34ea3448053f28':
docs: add 2.2 platform highlights
2010-05-19 18:08:34 -07:00
Scott Main
43fd902154
am 68728cb3: docs: add 2.2 platform highlights
...
Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp
* commit '68728cb3b44aba16abc298a37f6110ed00a781dd':
docs: add 2.2 platform highlights
2010-05-19 18:06:51 -07:00
Mathias Agopian
cfaf4594dd
am 225eb7b5: am 66c46a6b: added RWLock C++ wrapper
2010-05-19 17:31:57 -07:00
Mathias Agopian
b15c2e5d03
am 66c46a6b: added RWLock C++ wrapper
2010-05-19 17:29:57 -07:00
Alex Sakhartchouk
bf482f97c9
Merge "Added benchmark mode. Added some image processing operations."
2010-05-19 16:44:26 -07:00
Vasu Nori
57c7a487a7
Merge "DatabaseCorruptionHandler causes NPE"
2010-05-19 15:20:29 -07:00
Mathias Agopian
dcf01e6644
added RWLock C++ wrapper
...
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
2010-05-19 15:12:59 -07:00
James Dong
bb0b490a6b
am 84b6cd92: am 4414b9ad: Merge "Initial software encoder checkins" into kraken
2010-05-19 13:18:16 -07:00
James Dong
3949ffa42e
am 4414b9ad: Merge "Initial software encoder checkins" into kraken
2010-05-19 13:16:09 -07:00
James Dong
df7acdc186
Merge "Initial software encoder checkins" into kraken
2010-05-19 13:14:24 -07:00
Wink Saville
3a04c4192d
am 199d3783: am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
2010-05-19 13:09:11 -07:00
Wink Saville
3fdcfabfd6
am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
2010-05-19 13:07:14 -07:00
Wink Saville
ebcfdd6b97
Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
2010-05-19 13:05:55 -07:00
Mike Lockwood
807b81688f
Merge "PTP host: Implement getObjectHandles and getObjectInfo commands"
2010-05-19 12:18:16 -07:00
Scott Main
5b10a10dd7
am f94d2834: am f5172c55: am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
2010-05-19 12:14:05 -07:00
Scott Main
cef0b89660
am f5172c55: am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
2010-05-19 12:12:09 -07:00
Scott Main
75c10b7542
am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
...
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken
* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
docs: revise platform intro
2010-05-19 12:11:03 -07:00
