OSDN Git Service

am 6a44d227: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
authorElliott Hughes <enh@google.com>
Wed, 12 Jun 2013 23:16:09 +0000 (16:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Jun 2013 23:16:09 +0000 (16:16 -0700)
* commit '6a44d2271f372d0c65b05a5d3377bd00ce92824e':
  Take some fixed upstream copyright headers and regenerate NOTICE.


Trivial merge