Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:47:09 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:47:09 +0000 (17:47 +0000)
commit47ae4149c051b6d45132b10cac3b078ebc7ad990
treeaad755add28ec91c80292ca2400259fdc25363f0
parentf1da559fd4c2f7382b9919e003df6c8ce61400ac
parent3112afb2039b6a6517c21916290735eec082d611
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e2387 am: 8b78db19fd am: 9d0568c51e am: e6eb42c8fd" into nyc-mr2-dev-plus-aosp am: c5ebf8cdab" into oc-dev-plus-aosp
am: 3112afb203

Change-Id: Ic33d33e521a88675538db1c0c9584708a17d8c6e