| commit | 62f8d4049c41c8ed9e9f4d2e45ab2aa5c2d7455c | [log] [tgz] |
|---|---|---|
| author | Ben Lin <linben@google.com> | Thu Jul 06 14:05:11 2017 -0700 |
| committer | Ben Lin <linben@google.com> | Thu Jul 06 21:55:46 2017 +0000 |
| tree | 9f666c3c7be898fa01e7fdb99f9cced873503eea | |
| parent | bba7aea4982eb6cff31f3cd5e766805dbdac13ce [diff] |
Fix a merge conflict miss that caused regression. Originally, commit Iee6f55c677a52664d6fd6e16d760510081d5d867 fixed an issue where views were getting added everytime screen locks on/off. Commit Ibef5b21af2a5f25839222880e2b63f0ceee74d06 however missed a line, and caused regression when resolving conflict. Bug: 63396744 Change-Id: I5bd323a83026cfb2b3843bc6e5cd57fe35b21788