OSDN Git Service

Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master
authorHui Yu <huiyu@google.com>
Wed, 13 Feb 2019 20:29:38 +0000 (12:29 -0800)
committerHui Yu <huiyu@google.com>
Wed, 13 Feb 2019 20:32:27 +0000 (20:32 +0000)
commitf57e40124199b19ab8b6a852a602bf4fe5805a2a
tree4b1f819defc80a673cdf9c259ef03b2c4a81a73d
parent539c545dc7ba749eada12ef4c0bf55535d3500d4
Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master

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