tree 7c3ae3eecc16c50c794aff141a89b14942117364
parent 0895d83cb62d269468e64a00e9e89fa7697f2f84
parent 01cff464978aa0f749f42650180b45ea56cb17de
author Jean-Baptiste Queru <jbq@google.com> 1280451129 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280451129 -0700

am 4506c62a: fix inaccurate copyrights

Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
  fix inaccurate copyrights