tree c0cdfe01f019ae6448fe76db3d86bd38241eb510
parent 563799c378e811653878d58c1ad9668122f7b4ec
parent 7d856b6c7b43b70fa9dfb5ea98f627b1851c50b6
author Jonathan Solnit <jsolnit@google.com> 1500674882 -0700
committer Jonathan Solnit <jsolnit@google.com> 1500674882 -0700

Merge branch 'android-msm-bullhead-3.10-nyc-mr2-security-next' into android-msm-bullhead-3.10-nyc-mr2

September 2017.2

Bug: 63173580