tree 1b2b9d421a19c1c3595e6569580adf5f05c5659d
parent 8e258000e86faa5dd0009caa5823119116ef5dec
parent 154a320069a316491c25b716f2aeea8c51a758e8
author Jean-Baptiste Queru <jbq@google.com> 1280517223 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280517223 -0700

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

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

* commit '154a320069a316491c25b716f2aeea8c51a758e8':
  fix inaccurate copyrights