| commit | 6493c436cca5b280c32a53bf54bdd51aeb75308b | [log] [tgz] |
|---|---|---|
| author | Mahaver Chopra <mahaver@google.com> | Mon Feb 22 18:03:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 22 18:03:11 2016 +0000 |
| tree | 793c87af5ab26c6ca1710fba95257d4daf5bfcad | |
| parent | a6376e42c0f85703d990d5f5451d12fc1aa8461c [diff] | |
| parent | 8158ca998a027e7262600508dfab4c58cc99e842 [diff] |
Merge "Don\'t add padlock if restriction is\'t set by admin" into nyc-dev am: 8fec2b2ab0 am: 8158ca998a * commit '8158ca998a027e7262600508dfab4c58cc99e842': Don't add padlock if restriction is't set by admin