tree 2bddbbccf326f6dd53919afb4c582087ea26f6de
parent 98afb342df74a657e69a478b5ace19450b579660
parent 02a0381e516f1782ff5a2170ed3b3e1bda7284fe
author Amith Yamasani <yamasani@google.com> 1461620236 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461620237 +0000

Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev