From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 5 Apr 2018 00:46:12 +0000 (-0700)
Subject: Merge "Remove duplicate definitions of utility variables"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9473e846e5eda95773ad9bc0f7302f14e5c402cb;p=android-x86%2Fframeworks-base.git

Merge "Remove duplicate definitions of utility variables"
am: 8d5a39ac62

Change-Id: I38a6dff84d3ccad0a1b895a4416b14e59c406953
---

9473e846e5eda95773ad9bc0f7302f14e5c402cb