tree 8987efd9cc456f45f9cba2e1c39afe1672af0088
parent 7659033819ea66f56697a71d1dc2bce7ccdb413a
parent 8a613fb4a68bcc33490a89646f2a346e5b798875
author Conley Owens <cco3@android.com> 1426713221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426713221 +0000

am 8a613fb4: Merge "Add MODULE_LICENSE file"

* commit '8a613fb4a68bcc33490a89646f2a346e5b798875':
  Add MODULE_LICENSE file