tree 0c2d144c78ea2615f5bdbcceda1def3106e89c3c
parent 172e038f9e5b711a77afe7e8899343215cf25c9e
parent 5fb409b7b0b0a4ecca5fd2a6c7dc5ce421f6b7cf
author Elliott Hughes <enh@google.com> 1359506524 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359506524 -0800

am 5fb409b7: Merge "Bring the NOTICE files back up to date."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '5fb409b7b0b0a4ecca5fd2a6c7dc5ce421f6b7cf':
  Bring the NOTICE files back up to date.