OSDN Git Service

Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
authorMihai Popa <popam@google.com>
Tue, 3 Apr 2018 02:53:48 +0000 (19:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 02:53:48 +0000 (19:53 -0700)
commitda02fac9fea2a3ea5730d6595fb246c48eb3462b
tree0a6b10c456e64e14b710b9147305681ff1872f9e
parentb0765db5b8e6ac8682b6e795810dc2d129352e26
parent285797a45a83b20ccdf75a4ca7a762a285e54561
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
am: 285797a45a

Change-Id: I81474f04a8d33d2cf063aa0d89b7abca255d3864