| commit | 5c69f5b276b65bd4b8000d2b6e56baddccf89846 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Mon Nov 03 14:41:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:41:07 2014 +0000 |
| tree | 2c78f0a3440f79788ede6fcbe2cb838ebd9df8ef | |
| parent | 726e9ea7322d5122a22a0077d58ae92870962df4 [diff] | |
| parent | 2e647efe01dcdb82d2d7f8a23540ba6b690a95d6 [diff] |
am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev * commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6': Move LOCK_TO_APP_EXIT_LOCKED from System to Secure