7871e84b34
Merge commit 'c75348a9384a5310bb34bf02cafd0076630f4a28' into eclair-plus-aosp * commit 'c75348a9384a5310bb34bf02cafd0076630f4a28': do not merge