tree a508ac8c7ea8c4662ff812dfcbf9a511f11f735e
parent 2f588e35a54f7c0f36cf999afd4d9cf9d67deaab
parent ef78b471f61e0158ef897bb00e8b2b34747c4bd4
author Conley Owens <cco3@android.com> 1426722575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722575 +0000

am ef78b471: Merge "Add NOTICE and MODULE_LICENSE files"

* commit 'ef78b471f61e0158ef897bb00e8b2b34747c4bd4':
  Add NOTICE and MODULE_LICENSE files