Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)
commita9807af9c9411ab1c9cee36adf62601c9936b6bb
treef990a421cd55bf200b84120ef1fff5d425394b84
parent0c3bd3864711bda1513a88957bc06afa8272bcbe
parentc5ebf8cdaba9ad0023e096a6cbdab76abb925481
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd" into nyc-mr2-dev-plus-aosp
am: c5ebf8cdab

Change-Id: Ia06915d3462d92da63e9dff67c8c8e567a4cbf94