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

Change-Id: I4c6e47cf00dec052644cdbebe60b3ac408ae553b


Trivial merge