tree f39b586a452531993f3da914e99f1c1e00a84eff
parent 762635c0c2f6fe86cb5ecb25f947ec7b9d6f61de
parent 67d205c3ab98f9ea506b7b6d90e0496c731ad11e
author Jason Monk <jmonk@google.com> 1502916040 +0000
committer android-build-merger <android-build-merger@google.com> 1502916040 +0000

Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
am: 67d205c3ab

Change-Id: I7989438ced94e356ed355461d03192ef668cd9a8