Commit 11472ced authored Jul 30, 2010 by Jean-Baptiste Queru Committed by Android Git Automerger Jul 30, 2010

am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread

Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights

parents 1000e383 8fb1869d

There are no changes