| commit | d438deffad74ed5cc37b68100577215b9f08e6ff | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Fri Aug 15 20:23:58 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 15 19:03:20 2014 +0000 |
| tree | 0ed71cbcb42ae6af13e9334b2d209d38a2872017 | |
| parent | b7ebbded5f1512c5747acc0f06a42399d7710728 [diff] | |
| parent | 3d9eb78fe91ab2479eb38443aed588e10421e31b [diff] |
Merge "Apply lockdowns when user restrictions are set." into lmp-dev