Merge commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f'
* commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'
* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8797066aa8443df38118f24ed46fd052b2f4a37b'
* commit '8797066aa8443df38118f24ed46fd052b2f4a37b':
Move API change details from highlights doc to version notes doc.
Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp
* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '40351ecec878910d7f0ac6988cd8010dc82b0a99' into eclair-plus-aosp
* commit '40351ecec878910d7f0ac6988cd8010dc82b0a99':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b' into eclair-plus-aosp
* commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b':
Move API change details from highlights doc to version notes doc.
Merge commit '7350ff3d572624abb5a46c3c4969e0b91cb05109' into eclair
* commit '7350ff3d572624abb5a46c3c4969e0b91cb05109':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5' into eclair
* commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5':
Move API change details from highlights doc to version notes doc.
CDMA SMS status reports are messages with bearer data message type
DELIVERY_ACK. Identify these messages after parsing during demux,
update the deliveryPendingList and generate a RESULT_OK intent in the
same manner as GSM.
Addresses issue:
http://buganizer/issue?id=2047571
Change-Id: Ia38718b0bb169a0f3398f50c27a95e8bce7e4c99
Merge commit 'b706e783aee5b3fdcd132b5027493b68440d8ea4'
* commit 'b706e783aee5b3fdcd132b5027493b68440d8ea4':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
Merge commit '2ef1013836393f2800c74c47a5488e3a0de3097c'
* commit '2ef1013836393f2800c74c47a5488e3a0de3097c':
make sure conditions will return when the status of a surface is not NO_ERROR
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp
* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
change the japanese homepage Market link
to go to the Market dev site instead of the English market promo site
Change-Id: I81e8675355edee05540f291fdb2654fa44ae1ffa
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...
Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
