Merge "Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5."
authorElliott Hughes <enh@google.com>
Wed, 12 Aug 2015 23:47:09 +0000 (23:47 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 12 Aug 2015 23:47:09 +0000 (23:47 +0000)

Trivial merge