| commit | e40328e12f0eee2436cdfa83aa519e3c490daf62 | [log] [tgz] |
|---|---|---|
| author | Steve Pfetsch <spfetsch@google.com> | Thu Oct 12 19:38:03 2017 -0700 |
| committer | Steve Pfetsch <spfetsch@google.com> | Thu Oct 12 19:40:52 2017 -0700 |
| tree | d3cde6b49937e050d3661d256f33368ee8ebfa72 | |
| parent | 79df07b459c8364def0f57d711b05ca0d5d822b4 [diff] | |
| parent | 2970ea4d78dd2257f892129cb7ff62e905c8d6ed [diff] |
Merge branch 'android-msm-angler-3.10-oc-security-next' into android-msm-angler-3.10-oc December 2017.1 Bug: 67749245 Change-Id: I29f4c24bd9139e2e2ec5d8ebc5aa103ddf70308f