| commit | 7218e9c6beaa066237c6b2aac6d10dd7dc84e0a2 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Jun 24 22:55:51 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 24 07:59:24 2014 +0000 |
| tree | 22e8a6df8eb1743e07f5a5fa2a61310258ee0b91 | |
| parent | 04d480e1c338a921a8659e165d74f8437785acc1 [diff] | |
| parent | c5185f2bf1bf15ea0cfd72d30167fcbb1d61d437 [diff] |
Merge "The profile owner shouldn't control lock task"