OSDN Git Service

Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a...
authorHui Yu <huiyu@google.com>
Wed, 13 Feb 2019 20:10:27 +0000 (20:10 +0000)
committerHui Yu <huiyu@google.com>
Wed, 13 Feb 2019 20:10:27 +0000 (20:10 +0000)
commita558b05d53f02833982037be0c0be1a203a45fc5
tree591a08b4012b6aa090c66de6a500491bb455f2bc
parenta738111eeea622a25cb50ed7bcae5cbf0218b137
Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"

This reverts commit a738111eeea622a25cb50ed7bcae5cbf0218b137.

Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title.

Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97
cmds/statsd/src/atoms.proto
services/core/java/com/android/server/am/ActivityManagerService.java