tree 46da788c06615023dfe921be131542d7dd434e88
parent a9ef0400638789581469d2af7aed5725c4414d20
parent 1dadfec6e02cc362ed36e7e39b7cc49b6a00731d
author Vince Harron <vharron@google.com> 1431980618 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431980618 +0000

am 1dadfec6: Merge "Improved/clarified license guidance for GPL code." into mnc-dev

* commit '1dadfec6e02cc362ed36e7e39b7cc49b6a00731d':
  Improved/clarified license guidance for GPL code.