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

Change-Id: I91b5e5909e78a996273bc7103c5d8978cc6c2a7f


Trivial merge