tree c8e4a11a7704edf1c970f40fb6ce65477023fcf8
parent 5605454636f9dfa29d85e0606d5e86ac7ca1cab3
parent cefe83a1e446d3bf5014ffe3bbaff77df9c1e1cc
author Conley Owens <cco3@android.com> 1426712608 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426712608 +0000

am cefe83a1: Merge "Add NOTICE and MODULE_LICENSE files"

* commit 'cefe83a1e446d3bf5014ffe3bbaff77df9c1e1cc':
  Add NOTICE and MODULE_LICENSE files