Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp * commit '4a2b3ef1810135bea25a827d7c52767f50c528b6': new assets
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp * commit '4a2b3ef1810135bea25a827d7c52767f50c528b6': new assets