tree b602a2a88fb6684f323ef8cbfcb09214fca2a0bc
parent 3512ed49a0cecd103de62eb9869e60dab144a6fb
parent 0105f1cc9aa2ea3c683c197b18747f5b04310c27
author Ying Wang <wangying@android.com> 1390863662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390863662 +0000

am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"

* commit '0105f1cc9aa2ea3c683c197b18747f5b04310c27':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE