tree c7eca0934c43657ce4581edf263f06c571842a5d
parent 322baac037973bc3fdcb0256c5ec30ae6955c9f3
parent cf69f73d09241607c6330d76ad22da4d9f9a91eb
author Conley Owens <cco3@android.com> 1426722592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722592 +0000

am cf69f73d: am 8a613fb4: Merge "Add MODULE_LICENSE file"

* commit 'cf69f73d09241607c6330d76ad22da4d9f9a91eb':
  Add MODULE_LICENSE file