commit | e2e5daf291031a2dfd892a4ff239b58050d054a7 | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Tue Nov 06 09:20:41 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 09:20:41 2018 -0800 |
tree | b1bb746c71d8c86e082fcb1848364fc2bc6f4bc8 | |
parent | d0654f1daa4417713dc4e722278559921c537304 [diff] | |
parent | cfbbe2d89decd95fa71f20931bc03ae7b8bb4264 [diff] |
Merge "Fix missing showWhenLocked activity attribute" am: f1e9db0cbe am: cfbbe2d89d Change-Id: I93f86f0da6a557065a83044fcd77eb31eda8ce29