OSDN Git Service

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


Trivial merge