| commit | 476e010d80286fa36c5e62b75aefd83db8255988 | [log] [tgz] |
|---|---|---|
| author | Steve Pfetsch <spfetsch@google.com> | Thu Oct 12 19:44:11 2017 -0700 |
| committer | Steve Pfetsch <spfetsch@google.com> | Thu Oct 12 19:44:58 2017 -0700 |
| tree | 1f53efd2f06f85bb91f17466c8e6d8ac7e9611b4 | |
| parent | 2a6401aeb4526e738d2252533e9ec506bb3d965c [diff] | |
| parent | 510c22e9a69e34e228cc41f3a18d9fb0edd8f085 [diff] |
Merge branch 'android-msm-bullhead-3.10-oc-security-next' into android-msm-bullhead-3.10-oc December 2017.1 Bug: 67749279 Change-Id: If21721d2c33c50d2b31338fae8ec7239e1d61294