Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '52ab52f35b9b6be78b818f377608c18d97f137ce'
* commit '52ab52f35b9b6be78b818f377608c18d97f137ce':
Update the names of the widgets when the locale changes.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'
* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '36cf8123d8cf9047c64633a963706f40cecc0bb1'
* commit '36cf8123d8cf9047c64633a963706f40cecc0bb1':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58' into eclair-mr2-plus-aosp
* commit 'fa48000a25a32de1a117c716dcd6f9c255bffe58':
Update the names of the widgets when the locale changes.
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-mr2
* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
Update the names of the widgets when the locale changes.
Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp
* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '419264c22c8776274119e66349068f8c712b1c2f'
* commit '419264c22c8776274119e66349068f8c712b1c2f':
doc change: edits to the screens support doc.
Merge commit 'd278ffc0984d730b333f53636a223eae6d9b7657' into eclair-mr2-plus-aosp
* commit 'd278ffc0984d730b333f53636a223eae6d9b7657':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '96f225afad61ee701dd84348e380a40ff8900fc0' into eclair-mr2-plus-aosp
* commit '96f225afad61ee701dd84348e380a40ff8900fc0':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug 2205782.
Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
Merge commit '875d235cf1c685597026997bae49ea820351b576' into eclair-mr2-plus-aosp
* commit '875d235cf1c685597026997bae49ea820351b576':
doc change: edits to the screens support doc.
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-mr2
* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
Merge commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-mr2
* commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747':
doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit 'e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-mr2
* commit 'e12191a7ec9ab35e4ce80726be2734881a24a223':
doc change: edits to the screens support doc.
Fixes bug b/2158297 (lock screen should time out after 7 seconds)
Change-Id: Ia3f7ef6464129ab78283923dbfd7f7472136e676
Signed-off-by: Mike Lockwood <lockwood@android.com>
