tree bfe030d55ac0c24732de982788ef8fa96e4269c8
parent 8ec341627ccba7929d297b072a398291fe796d2b
parent 5d983d2ba930c101072aec11cb328fb498707568
author Mihai Popa <popam@google.com> 1522708937 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522708937 +0000

Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev