tree f1d043ea99d0a2323dda6100f8f865dd95eaeca4
parent cb685dbe900c41e4d3f240b3e3801b47cfa77171
parent 346f7602804cce0f0c09863d5886aa4852632a89
author Daniel Sandler <dsandler@android.com> 1497980038 +0000
committer android-build-merger <android-build-merger@google.com> 1497980038 +0000

Merge "Log screenshot exceptions." into oc-dr1-dev
am: 346f760280

Change-Id: Ib7d97e5186714fd3b0cc41c451542a5286d3bb0e