tree 73afb17d55d18bc6d69b2384fc1b3bbb37da1158
parent 1f90e4357362ff747268ed02f255db627c42e088
parent ab39630cefa422f2a856bcd42b2e4379f668f7b8
author Christopher Ferris <cferris@google.com> 1490296701 +0000
committer android-build-merger <android-build-merger@google.com> 1490296701 +0000

Merge "Verify at least 2 frames out of signal handler." am: 8f804d71d0
am: ab39630cef

Change-Id: Iec48a7620b79a6a06689068895eee0487ee02c53