tree ab8fa2ee3c39d62479304c5226c6794eeef404e1
parent b1eeab34a658b9b592452328c2011ce4e02fc98b
parent aaa15aebcc8819a82a7cddb434833aad274be510
author Tadashi G. Takaoka <takaoka@google.com> 1541511746 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541511746 +0000

Merge "Fix missing showWhenLocked activity attribute"