tree c8e4a11a7704edf1c970f40fb6ce65477023fcf8
parent 5f1d9f7222787c933d7d81dc2be446eddf010ce5
parent b9e2203ad8c0b7d575dd836da3da06dc7721c03c
author Conley Owens <cco3@android.com> 1426722554 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722554 +0000

am b9e2203a: am cefe83a1: Merge "Add NOTICE and MODULE_LICENSE files"

* commit 'b9e2203ad8c0b7d575dd836da3da06dc7721c03c':
  Add NOTICE and MODULE_LICENSE files