tree c62d71e5ee9e9f5ca78cb22912d94135b78ba811
parent 55189a0fbd26cfd84939d9d3a42a1800a63bd2c5
parent 2815b1dd452a7fb7de6ba0df2cb250987a1b62c4
author Elliott Hughes <enh@google.com> 1371078814 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1371078814 +0000

Merge "Take some fixed upstream copyright headers and regenerate NOTICE."