Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:19:14 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:19:14 +0000 (16:19 +0000)
commit9a1fa38cb13240d23b88af1072e584e845ed4ab0
tree19665a710d163aac7c6c22c872523186e6a9cbce
parentd91f25e5036f23eeaa63f96e754cd4f1d461e555
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: I1c18d2febe3a2747cdd9fd360d4ac94c352838e7