Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'
* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp
* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
Make vCard code refrain from using NEIGHBORHOOD field when importing.
Merge commit 'efe676074b55867817c723e8232078810479906c'
* commit 'efe676074b55867817c723e8232078810479906c':
Solve the mutual interdependency problem between common and framework:
Merge commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a' into eclair-mr2-plus-aosp
* commit 'b99c469e2bb96420ee3c57b351aa23dd4322852a':
Solve the mutual interdependency problem between common and framework:
Merge commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8'
* commit '5b2f5ced25aee6fec49ffd30abeca2801c98fbd8':
Modify vCard exporter code so that it does not emit non-Ascii type.
Merge commit '11f5fe94a03405ccc644bfc0870bbb740ed39145'
* commit '11f5fe94a03405ccc644bfc0870bbb740ed39145':
Attempt to fix the build server build: make the common library
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187'
* commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '41029cf413abbfdf004e04f192a440e457701c47'
* commit '41029cf413abbfdf004e04f192a440e457701c47':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
* changes:
Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).
* changes:
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
Merge commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05' into eclair-mr2-plus-aosp
* commit 'ddd017f872bee40450c0e73dcf6608a9fdc49a05':
Modify vCard exporter code so that it does not emit non-Ascii type.
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.
Part of the fix for b/2243198 (Black screen lockup after ending call)
Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Have framework include the common source files directly when building,
then build common as a static library separately (depending on
framework, like everything else).
Goes with a companion change to build/core/pathmap.mk.
Merge commit 'b9386ed929b72308cbfc68d2833a13aeda38f431' into eclair-mr2-plus-aosp
* commit 'b9386ed929b72308cbfc68d2833a13aeda38f431':
Attempt to fix the build server build: make the common library
* changes:
docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
Merge commit '4373346073250b668c0ff287b0d584401f7f3c96' into eclair-mr2-plus-aosp
* commit '4373346073250b668c0ff287b0d584401f7f3c96':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-mr2
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b' into eclair-mr2-plus-aosp
* commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Merge commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330' into eclair-mr2-plus-aosp
* commit '8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330':
Create android-common static library which gets included in frameworks.jar,
* changes:
Create android-common static library which gets included in frameworks.jar, but can also be used by unbundled apps. Move android.text.util.Regex there as a starting example, renamed to a more sensible (?) com.android.common.Patterns. Set up a corresponding test package, and move RegexTest (to PatternsTest). Update clients.
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
Merge commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11'
* commit 'f28ae14f8fc146c42cb817e15363cac0e2b0ab11':
Do not grow the viewport width to infinite to fit
