tree fe9fb6f6b43aac3e9fefbe38d7a9758283c5ac85
parent dd8b2c943d47ff757c352c19c87aaa680d782f8a
parent fe7cab60424b0d64d10f3fea6aaf236109b58d14
author Adrian Roos <roosa@google.com> 1476810523 +0000
committer android-build-merger <android-build-merger@google.com> 1476810523 +0000

Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
am: fe7cab6042

Change-Id: Ia9ae415a51f7a103c4af000e72ac2f2e93a92949