| commit | df57d4593246c0534afcd0f17b9792b64cd7c8d5 | [log] [tgz] |
|---|---|---|
| author | Thierry Strudel <tstrudel@google.com> | Wed Jul 20 13:50:41 2016 -0700 |
| committer | Thierry Strudel <tstrudel@google.com> | Wed Jul 20 13:50:41 2016 -0700 |
| tree | 3d7cf62abecf121d968002a0f25a9eb7218a74a9 | |
| parent | cef4f176af2032f12254bc388ddcbfc46eaf47a5 [diff] | |
| parent | 5345d0b25f4d8e5fa93bcaf2186a4b365b18d092 [diff] |
Merge branch 'android-msm-hammerhead-3.4-mnc-mr1-security-next' into android-msm-hammerhead-3.4-mnc-mr1