90390e6918
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp * commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df': Updated media playback controls, unlock screen, misc framework assets