tree 70229fe95c84d6465df6050b8bb5584ebf58ce98
parent 3c4e1d6943d8546144f3f4ae1eb81965c0adf486
parent ace7191046ccd4f51cdbdd72000898f67f50e3a4
author Sudheer Shanka <sudheersai@google.com> 1457626153 +0000
committer android-build-merger <android-build-merger@google.com> 1457626153 +0000

Merge "Adjust restricted lock positions as per new design." into nyc-dev am: 1749d518b7
am: ace7191046

* commit 'ace7191046ccd4f51cdbdd72000898f67f50e3a4':
  Adjust restricted lock positions as per new design.