tree a338d978f475e50cf8bd87d53c6996118143babf
parent d7ee0a7df8e2b657290a597978953cd691eba9b1
parent baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7
author Conley Owens <cco3@android.com> 1425593972 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425593972 +0000

am baa6a15c: Merge "Add MODULE_LICENSE file"

* commit 'baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7':
  Add MODULE_LICENSE file