Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: eba26e...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:18:55 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:18:55 +0000 (16:18 +0000)
commitd91f25e5036f23eeaa63f96e754cd4f1d461e555
tree19665a710d163aac7c6c22c872523186e6a9cbce
parent6246b155712931c1eef4c6288b8131db0e7e0912
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: I15f9dec76e3ffaa3d184808060137fe34a831b36