Merge commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770' into eclair-mr2-plus-aosp
* commit '14f81209b79faf87bf4ffed6fbaaa9da6a75d770':
Remove placeholder "-" label text, that was breaking the build.
Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-plus-aosp
* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2
* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Previous change 33290 was screwed up.
Xav, please pardon a repo newbie!
Merge commit '75239b51770825ea3da2673d4b81be1676145d51'
* commit '75239b51770825ea3da2673d4b81be1676145d51':
docs: make the apidemos app index page only display the
Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp
* commit '21acc90055935d052e350fe441091091c2421010':
docs: make the apidemos app index page only display the
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.
this is a silly hack, but a temporary one until these
samples are moved.
Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
The preview size will be checked now in Camera HAL. So, we change the code to
get the supported preview sizes and find one of the size that match the
surface's width and height.
Merge commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'
* commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
Put this change back, false alert with build breakage
Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp
* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
Put this change back, false alert with build breakage
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-plus-aosp
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
Merge commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a'
* commit '0badc7f8c3b3fb83d5556da8b9733b4e7b7b419a':
Update live wallpaper examples to new api.
Merge commit '81515abca85e742584db3c7cdacc5b840f0eb650' into eclair-mr2-plus-aosp
* commit '81515abca85e742584db3c7cdacc5b840f0eb650':
Update live wallpaper examples to new api.
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-plus-aosp
* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
Update live wallpaper examples to new api.
Merge commit 'c3e07f9d442ba097f264777693938b781e290da4'
* commit 'c3e07f9d442ba097f264777693938b781e290da4':
Updating sample plugin to test java class loading.
Merge commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743'
* commit 'f9e27790ebed44735b28ba23c3f95f21c6f30743':
Fix type of _id col in SearchableDictionary
Merge commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp
* commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
Updating sample plugin to test java class loading.