tree dd16a3a829daceeb05e5209254c0a2ff37bf29b2
parent 90a9ef2fb93a015bd9196c95720ce502ac3c0efe
parent 06410be0995803cc66e31ecd32a6a362c71d1d9e
author Mahaver Chopra <mahaver@google.com> 1456163553 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456163553 +0000

Merge "Don't add padlock if restriction is't set by admin" into nyc-dev