Merge "Fix inconsistent use of screenlock" into nyc-dev

Browse Source

am: 451ff8e916

* commit '451ff8e916b7a1ff9208bbf7f9330b9db633eac5':
  Fix inconsistent use of screenlock

...

This commit is contained in:

Kenny Guy

2016-02-17 22:05:04 +00:00

committed by android-build-merger

parent f891ba72c1 451ff8e916

commit be893c7f48

1 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files