tree 48cb567c4da9d416c3d14a5308feb563669b04d2
parent fc1f97bc051863f9c2ec41d749ce5b4513b9f0fc
parent 16f9a4cb3024b600733eafaf841f76ac70ba881a
author Conley Owens <cco3@android.com> 1426722582 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722582 +0000

am 16f9a4cb: Merge "Add MODULE_LICENSE"

* commit '16f9a4cb3024b600733eafaf841f76ac70ba881a':
  Add MODULE_LICENSE