tree 4888093ebe353cb90adcf3ff578d48a340b461ee
parent a3bcb76fb69ab4169a0b8397505cf7e8a8c94183
parent 59b9885bc8b781b6312adedd67c2c7c270f9213c
author Chavi Weingarten <chaviw@google.com> 1498776065 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498776065 +0000

Merge "Added Activity flags to show on lock screen."