Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/autodetect/master' into...

git log --pretty=format:"%h %ad | %s%d [%an]" origin/abt/topic/gmin/l-dev/master..origin/abt/topic/gmin/l-dev/autodetect/master:
  875a964 Tue Feb 24 18:00:30 2015 +0100 | Fix LOCAL_MODULE for auto-detected targets (origin/abt/topic/gmin/l-dev/autodetect/master, m/abt/topic/gmin/l-dev/art/master) [Thierry Escande]

git diff --stat origin/abt/topic/gmin/l-dev/master..origin/abt/topic/gmin/l-dev/autodetect/master:
  Android.mk | 4 ++++
  1 file changed, 4 insertions(+)

Change-Id: Iadd5af67100a54cb5935d019ea31b078afb19e18
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>