| commit | 6a2992647c36eab7705553c794c89255577a0048 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:28:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:28:07 2015 +0000 |
| tree | 4299c987e6cff9880ea5e2bd572a7c7c29286f23 | |
| parent | 0facd63eae0db3354ee72a572a5fcac990b6b464 [diff] | |
| parent | f44043daf3ea073823b10f535b237b3ab624a291 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/security into lmp-mr1-ub-dev