| commit | 847afadd7a3f31fd2e68046d0faa3609dd20667a | [log] [tgz] |
|---|---|---|
| author | Phil Weaver <pweaver@google.com> | Wed Apr 06 17:49:46 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 06 17:49:48 2016 +0000 |
| tree | a28dcf1567c2937d8ac3c98442f23d70d8d46656 | |
| parent | 9745ea35361141a94e775920a941f913af01134a [diff] | |
| parent | 445fd2afe9336cecf76e41d78aa0b6f3b7053700 [diff] |
Merge "Eliminate deadlock in magnification." into nyc-dev