From: Narayan Kamath <narayan@google.com>
Date: Wed, 2 Apr 2014 11:08:59 +0000 (+0000)
Subject: am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk... 
X-Git-Tag: android-x86-6.0-r1~1588^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0919322d;p=android-x86%2Fbuild.git

am 1d671c23: am 823f0ba6: (-s ours) am 0239220a: am 2f5de9f5: Merge "Bring main.mk in sync with "

* commit '1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6':
  Bring main.mk in sync with master.
---

0919322dad6b7744c2698b21badc9596f9008153