Merge commit '930ca65a3cde0bf0817e38efee5772338abbf0c0'
* commit '930ca65a3cde0bf0817e38efee5772338abbf0c0':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Merge commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
Merge commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2'
* commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858'
* commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858':
Add gallery to the SDK build now that it's split from the Camera app.
Merge commit '7b0e85e1814376286c7d036f73241f9a19f70b08'
* commit '7b0e85e1814376286c7d036f73241f9a19f70b08':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp
* commit '920f2aaee64cc21f00d712ba17a1dded02ccff6b':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Merge commit '88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp
* commit '88f254bf55b8a78921d94f40e3bcc9c25a348570':
Add gallery to the SDK build now that it's split from the Camera app.
Merge commit '502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
Merge commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'
* commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
docs: add "figure" class for DIV elements that contain
Merge commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp
* commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
docs: add "figure" class for DIV elements that contain
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-mr2
* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp
* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Merge commit '6254132a3e1a850231f51cbead46891ced7aa083' into eclair-mr2-plus-aosp
* commit '6254132a3e1a850231f51cbead46891ced7aa083':
remove old p4->git import history
