tree 6fc6c107a65ee6673e23c862bc3369705f04f320
parent cb0d07b0e0f955f9175ce472a12c5a6f9363bc39
parent 65757da0c99cb4b49e1dc9e21facc7b4e67192cd
author Kenny Root <kroot@google.com> 1280256110 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280256110 -0700

am 65757da0: am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd'

* commit '65757da0c99cb4b49e1dc9e21facc7b4e67192cd':
  Correct copyright header for uptime and NOTICE