| commit | 8fec2b2ab0b279c0bcae6dece327ca24f3af4d25 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Mon Feb 22 17:52:33 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 22 17:52:33 2016 +0000 |
| tree | dd16a3a829daceeb05e5209254c0a2ff37bf29b2 | |
| parent | 90a9ef2fb93a015bd9196c95720ce502ac3c0efe [diff] | |
| parent | 06410be0995803cc66e31ecd32a6a362c71d1d9e [diff] |
Merge "Don't add padlock if restriction is't set by admin" into nyc-dev