From: Mike Lockwood <lockwood@google.com>
Date: Wed, 21 Mar 2012 23:58:35 +0000 (-0700)
Subject: Merge commit '2d50524'
X-Git-Tag: android-x86-4.4-r1~1224
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c05c2fee8982a6a05f7292de547f298690f2118;p=android-x86%2Fbuild.git

Merge commit '2d50524'

empty -s ours merge to skip change:

    main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: Id79485ba1c5ddae222e4d7bedb05efadff168f00
---

3c05c2fee8982a6a05f7292de547f298690f2118