tree 3eba7ac3ea893dd30d490c6b9172b4f9cceb0c84
parent 1e868f87341adad554233fdb7448c3f41e7d3aa0
parent 57ed41b9554aefdb7f881e15375d75b4c9dd58e9
author Conley Owens <cco3@android.com> 1426010361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426010361 +0000

am 57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"

* commit '57ed41b9554aefdb7f881e15375d75b4c9dd58e9':
  Add NOTICE and MODULE_LICENSE files