tree 7d8c6550c7a163e38ac255ff6912f74125c50054
parent aa493da365f349330c8932364a5650a795b04782
parent 629cf8c9486b31ccdc849a805ba624a27d56cbd0
author Android Build Merger (Role) <android-build-merger@google.com> 1484694671 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484694673 +0000

Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36" into nyc-mr2-dev-plus-aosp