tree 863ef23954aedc3bcad899a24c6107e7312d208f
parent 1298bb79938cb1f4cf920433b86716bd4108de0f
parent 53308d4cd5c4414402e979a6771f7ef3b35f5c2f
author Kenny Root <kroot@google.com> 1280255959 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280255959 -0700

am 53308d4c: Correct copyright header for uptime and NOTICE

Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
  Correct copyright header for uptime and NOTICE