tree 5e6868246843b7e40543893de769a5188e3d6629
parent b15b08cc0eb47560d25a2b70f892a248a0652bc2
parent a74b2e16a257455b25322913f6cd4899eca69179
author Conley Owens <cco3@android.com> 1413416062 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413416062 +0000

am a74b2e16: Merge "Add MODULE_LICENSE and NOTICE files"

* commit 'a74b2e16a257455b25322913f6cd4899eca69179':
  Add MODULE_LICENSE and NOTICE files