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)
am: c5ebf8cdab

Change-Id: Ia06915d3462d92da63e9dff67c8c8e567a4cbf94


Trivial merge