Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:47:33 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:47:33 +0000 (17:47 +0000)
commit86c3707bec16d2c716771331eea199e48923f7fa
treeaad755add28ec91c80292ca2400259fdc25363f0
parent47ae4149c051b6d45132b10cac3b078ebc7ad990
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: I4c6e47cf00dec052644cdbebe60b3ac408ae553b