Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:46:49 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:46:49 +0000 (17:46 +0000)
commitf1da559fd4c2f7382b9919e003df6c8ce61400ac
treeaad755add28ec91c80292ca2400259fdc25363f0
parenteb68dafe4e591fbab644750591c802e0ed3d7115
parentcd13f199b86bd2db7fcf019b4f5956f57245d930
Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd am: c57341fa99" into oc-dev-plus-aosp
am: cd13f199b8

Change-Id: I286884789c46631a0864e2f17ed72995b249d6a2