From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 18 Jan 2017 01:35:31 +0000 (+0000)
Subject: Merge "Add systrace details to storage measurements." am: a693382d94 am: b0858a472e... 
X-Git-Tag: android-x86-8.1-r1~844
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d9483a508029826b69b3bac437754d7a9d993f6;p=android-x86%2Fframeworks-native.git

Merge "Add systrace details to storage measurements." am: a693382d94 am: b0858a472e am: 6248cde3b3
am: 64a2155e1d

Change-Id: I93d3eba418b98081eca6a2b0cabda58db5649057
---

7d9483a508029826b69b3bac437754d7a9d993f6