tree e30a3b13becf9f107dc647bc69f547a85095ad60
parent b4578a163e0727f019cced101edc2cba0e9b1b0e
parent a512e16c8cb9509697a5f983b71987e7e0c91ba3
author Elliott Hughes <enh@google.com> 1445538238 +0000
committer android-build-merger <android-build-merger@google.com> 1445538238 +0000

Merge "Restore the MODULE_LICENSE_BSD and NOTICE files."
am: a512e16c8c

* commit 'a512e16c8cb9509697a5f983b71987e7e0c91ba3':
  Restore the MODULE_LICENSE_BSD and NOTICE files.