tree 5500813985cd55e41d6d84fb7b846b261c52da02
parent 11e44273dcdf905b0cd82d4a75ff1fd3be5b9d21
parent 6890dc95d02f85647179f2c32ec4d9691aaed472
author John Reck <jreck@google.com> 1496361323 +0000
committer android-build-merger <android-build-merger@google.com> 1496361323 +0000

Merge "Fix ANR & Crash on Ryu" into oc-dev
am: 6890dc95d0

Change-Id: I5f0a2fc7ab40b702e3e81ceb3bebd8ef44d22298