Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 994112e771fM
am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7' * commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7': fix inaccurate copyrights
Showing diff to84383376d87