tree ab1d3376afefae1f988fbcb61052e980c1885e9c
parent a7f44b5afe64199eeee715e613c7d42d2724232c
parent be11de2b52ac5f8cbb5a733821cb27002f2ea975
author Elliott Hughes <enh@google.com> 1359507853 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359507853 -0800

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

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