Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:47:09 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:47:09 +0000 (17:47 +0000)
am: 3112afb203

Change-Id: Ic33d33e521a88675538db1c0c9584708a17d8c6e


Trivial merge