tree a2810e32a169f5e01ae39ecec0b3951cadb54b48
parent 05875d3e985b5ffcd8804d58394a1afe01fc430f
parent d9841fb68f27bbd6019004962a025b23a831f6c6
author TreeHugger Robot <treehugger-gerrit@google.com> 1548298916 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548298916 +0000

Merge "Fix attr inheritShowWhenLocked cannot read from manifest."