3a899b8510
Merge commit '0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp * commit '0b9a12bf8101830fa9bde4015d0043df14cab6db': Fix issue 2929440