Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp
* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Fixes b/2244560 (Time Stamp On Bug Reports And Pictures Is One Hour Off)
Change-Id: I69324a33f80e41ce68a0e6fdba08b80ed9453e19
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp
* commit '507322ca5c5b678714314ae87e27d07c89c40785':
Add the checking for mediaplayer stress test.
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2
* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Merge commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336' into eclair-mr2-plus-aosp
* commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336':
docs change for ESD: add samples html pages for offline docs
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp
* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2
* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit 'aa5e25d2205fdba8663cfb7658e227658a06606c' into eclair-mr2-plus-aosp
* commit 'aa5e25d2205fdba8663cfb7658e227658a06606c':
Re-run update-api to fix the build.
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp
* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '50b690625b4dd37475d6966f9037801b2ddde5f8' into eclair-mr2-plus-aosp
* commit '50b690625b4dd37475d6966f9037801b2ddde5f8':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-mr2
* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp
* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
Refactor vCard test code and modify unit tests.
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp
* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
fix bad link in javadoc that's breaking SDK build
Factor out all the classes previously embedded in VCardTestsBase.java so that readers are able to
look over each file easily and each class explicitly mention the dependency between each other.
Make all the test cases use mVerifier in VCardTestsBase so that verify() call will not be
forgotten. Actually there were three tests found in which verify() was not called.
Internal issue number: 2195990
In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
