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

Change-Id: I863e7706bd571f06111b62ac54e4d7d2f3135e3a


Trivial merge