Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:19:34 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:19:34 +0000 (16:19 +0000)
am: 136bd5f683

Change-Id: I1950d324277fd52a4a6592fac936160da9cec9b4


Trivial merge