| commit | 8158ca998a027e7262600508dfab4c58cc99e842 | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Mon Feb 22 17:56:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 22 17:56:15 2016 +0000 |
| tree | 5674a7079444f899a1fd780ee556214cf842c358 | |
| parent | e20fc4179395f131646f241e18961c82f4ba7185 [diff] | |
| parent | 8fec2b2ab0b279c0bcae6dece327ca24f3af4d25 [diff] |
Merge "Don\'t add padlock if restriction is\'t set by admin" into nyc-dev am: 8fec2b2ab0 * commit '8fec2b2ab0b279c0bcae6dece327ca24f3af4d25': Don't add padlock if restriction is't set by admin