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

Change-Id: Ic97d42989936d7b590d13abe8a09e07fbe5bf378


Trivial merge