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

Change-Id: I15f9dec76e3ffaa3d184808060137fe34a831b36


Trivial merge