tree 75e00d336319eae99c96aa99a4bde3942814247c
parent a1b8c145cb23946a4dee221e6da085401ae60a4f
parent 0a383883fa3d358ff4af6b653a0918f4cd01ef7e
author Elliott Hughes <enh@google.com> 1359508152 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359508152 -0800

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

# Via Android Git Automerger (2) and others
* commit '0a383883fa3d358ff4af6b653a0918f4cd01ef7e':
  Bring the NOTICE files back up to date.