am 00118a48: Merge "Fix omission in NOTICE file." into gingerbread

* commit '00118a48754c6152266916e7205dff4e0c3a905a':
  Fix omission in NOTICE file.