From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 6 Jul 2015 18:12:40 +0000 (+0000)
Subject: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1235^2~65^2~156
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31d519fe37f6132f01b6193fec91d9f9b5b97908;p=android-x86%2Fpackages-apps-Settings.git

am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
  Fix init order so we have something to measure.
---

31d519fe37f6132f01b6193fec91d9f9b5b97908