| commit | 26a2aa5d8e18a3685b393fd3f72c5934a649356b | [log] [tgz] |
|---|---|---|
| author | Steve Pfetsch <spfetsch@google.com> | Wed Jun 07 15:27:37 2017 -0700 |
| committer | Steve Pfetsch <spfetsch@google.com> | Wed Jun 07 16:10:25 2017 -0700 |
| tree | 83b9ec1df15b4c0a494aa15968cf398a72ff7c83 | |
| parent | 80c8372084effb02255d60ead7486c81b388b29b [diff] | |
| parent | 869bd2cd3d6c17826b6f162e0d721174224b867a [diff] |
Merge branch 'android-msm-marlin-3.18-nyc-mr2-security-next' into android-msm-marlin-3.18-nyc-mr2 August 2017.1 Bug: 62368772 Change-Id: I84e7ff2c2348c1da9846119245c3b8cc8bdb164e