tree 44377cc1c04bba478d43b7397d2f6c587082347a
parent 99dda03231329a921625d48ef24f77aacd19ba9e
parent 46d3f3da581f1a7f8426e7b43eb509d9c375b83a
author Andrew Lehmer <alehmer@google.com> 1505235392 -0700
committer Andrew Lehmer <alehmer@google.com> 1505235416 -0700

Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18-oc

November 2017.1

Bug: 65558892
Change-Id: I416cc8f5064539eeb8d39234c009a549aca5945d
Signed-off-by: Andrew Lehmer <alehmer@google.com>