| commit | e38aa1324fa46606f25ac22cbf53b5d70d9c1dd6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 22:38:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:38:21 2015 +0000 |
| tree | 694cfb89258d1da48c68092ae1c65d0052646fe4 | |
| parent | 72ee8f9dcc35634631c5cde35cdf9aae7936702f [diff] | |
| parent | 6a2992647c36eab7705553c794c89255577a0048 [diff] |
am 6a299264: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/system/security into lmp-mr1-ub-dev * commit '6a2992647c36eab7705553c794c89255577a0048':