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

Change-Id: Ia4f57e8e675b0646153bc50c59b8401dffc9cb93


Trivial merge