tree f405083032b2431be1da7c19f343afc8e5bc7059
parent e8ca1189cce99db78fb5af3a6fb3817e847a5841
parent f920973352f59d63ed1caef7590b9d27fda6926e
author Conley Owens <cco3@android.com> 1426722572 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722572 +0000

am f9209733: Merge "Add MODULE_LICENSE file"

* commit 'f920973352f59d63ed1caef7590b9d27fda6926e':
  Add MODULE_LICENSE file