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

Change-Id: I5a67bd5cc95891335f7a78613b8c2754db1b4f59


Trivial merge