From: Jeff Sharkey Date: Thu, 27 Aug 2015 11:30:29 +0000 (+0000) Subject: am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to... X-Git-Tag: android-x86-7.1-r1~1235^2~269 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf82dbec38e70aa9a4ae0eb99ad4cbf4b7ae6d83;p=android-x86%2Fpackages-apps-Settings.git am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev * commit '31d519fe37f6132f01b6193fec91d9f9b5b97908': --- cf82dbec38e70aa9a4ae0eb99ad4cbf4b7ae6d83