| commit | 1cc9e5a9f05bac51fb8bac54b01861ca3551a5d0 | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Tue Nov 06 09:33:56 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 09:33:56 2018 -0800 |
| tree | 8cd77449e221f9fcd633cabf140098ae7dae7e29 | |
| parent | e0c2f7e17d2dfb426d1f0f09a5f61c4284fd150e [diff] | |
| parent | e2e5daf291031a2dfd892a4ff239b58050d054a7 [diff] |
[automerger skipped] Merge "Fix missing showWhenLocked activity attribute" am: f1e9db0cbe am: cfbbe2d89d am: e2e5daf291 -s ours Change-Id: Ia5d2bc8e920eeeaef1cdbde957b50f662abd5e2c