Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 6a5ed6aa9dcM
am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp * commit '154a320069a316491c25b716f2aeea8c51a758e8': fix inaccurate copyrights
Showing diff to8e258000e86