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

Change-Id: I1c18d2febe3a2747cdd9fd360d4ac94c352838e7


Trivial merge