Merge "Fix issue in CpuTimePerUid where microseconds are used as milliseconds" am: 4314aef811

am: f7905eb419

Change-Id: I78470d6cc8e6e42adc50407f04b0294b9b1e159a
This commit is contained in:
Misha Wagner
2018-11-27 06:42:53 -08:00
committed by android-build-merger

View File

@@ -1813,8 +1813,8 @@ message CpuTimePerFreq {
*/
message CpuTimePerUid {
optional int32 uid = 1 [(is_uid) = true];
optional uint64 user_time_millis = 2;
optional uint64 sys_time_millis = 3;
optional uint64 user_time_micros = 2;
optional uint64 sys_time_micros = 3;
}
/**