OSDN Git Service

Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
authorBeverly <beverlyt@google.com>
Tue, 10 Apr 2018 22:18:51 +0000 (15:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Apr 2018 22:18:51 +0000 (15:18 -0700)
commit752824221d2dc33df680fd813c4229fd00a87271
tree43226a4399b33730a205075dfabf4f5f7f2d4593
parentf5754451718886834b5e0321bc7cb06fb916c79f
parent45fe0bb6a0441e36f5ae13704e84aa88b1d95992
Merge "Set parent for auto zen rules to be zen rule page" into pi-dev
am: 45fe0bb6a0

Change-Id: Ie2e698f225ea43912621ea56f695c59f084118d0