OSDN Git Service

RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp...
authorHui Yu <huiyu@google.com>
Fri, 8 Feb 2019 23:28:45 +0000 (15:28 -0800)
committerHui Yu <huiyu@google.com>
Tue, 12 Feb 2019 19:17:44 +0000 (19:17 +0000)
commita738111eeea622a25cb50ed7bcae5cbf0218b137
tree386c1c138a4b55eea6d95240e4f5233c3aab2703
parent9e74581c7c29bd26de480230a9f80333f44bb225
RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master

To pick up statsd atom ProcessStartTime.

Bug: None.
Test: NA.
Change-Id: If6b99c0b6b501036ffde1e9a45194a039a8d7c73
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
cmds/statsd/src/atoms.proto
services/core/java/com/android/server/am/ActivityManagerService.java