tree cb98579fbd68062cee3d631a1d7e96faff6c5b8c
parent 362da0edbe38602db7bd98802708750c798601eb
parent a85b20d42925f9f0110404e148d5a627d8647829
author Android Build Merger (Role) <android-build-merger@google.com> 1501698695 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501698695 +0000

Merge "Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: e5a48c5bcb" into oc-mr1-dev-plus-aosp am: 2db8b9fa36"