| commit | 46d3f3da581f1a7f8426e7b43eb509d9c375b83a | [log] [tgz] |
|---|---|---|
| author | Andrew Lehmer <alehmer@google.com> | Tue Sep 12 09:50:35 2017 -0700 |
| committer | Andrew Lehmer <alehmer@google.com> | Tue Sep 12 09:51:38 2017 -0700 |
| tree | 030ce6e4121025f3f783c103370daf591623a088 | |
| parent | d72ede87f618ad78a397777bd723763634cb0dc9 [diff] | |
| parent | 9ad3e21d4cdfc9fab1f603d1e75c6243149d4aa3 [diff] |
Merge branch 'android-msm-marlin-3.18-nyc-mr2-security-next' into android-msm-marlin-3.18-nyc-mr2 November 2017.1 Bug: 65558892 Change-Id: I379ae9427a7e0418cbf8f1f31b7100b1831943b0 Signed-off-by: Andrew Lehmer <alehmer@google.com>