OSDN Git Service

am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Aug 2012 20:07:59 +0000 (13:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Aug 2012 20:07:59 +0000 (13:07 -0700)
* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
  core/Makefile: also look for device/*/build/tasks

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge