Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:19:34 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:19:34 +0000 (16:19 +0000)
commit264d774ad95b1105488903f4700907e97ccea361
tree19665a710d163aac7c6c22c872523186e6a9cbce
parent9a1fa38cb13240d23b88af1072e584e845ed4ab0
parent136bd5f683c1e9aeb1f5f3b7771a9aadcbf3502d
Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f am: e94af4b69f am: d92ff56cca" into nyc-mr1-dev am: 2e135d60c4 am: b804e15573 am: f981189859 am: a503de3a04" into oc-dev-plus-aosp
am: 136bd5f683

Change-Id: I1950d324277fd52a4a6592fac936160da9cec9b4